[PHP-CVS] cvs: php-src /ext/curl interface.c php_curl.h ZendEngine2 zend_execute_API.c

[Jani Taskinen]

sniper          Tue Aug  5 19:50:59 2003 EDT

  Modified files:              
    /ZendEngine2        zend_execute_API.c 
    /php-src/ext/curl   interface.c php_curl.h 
  Log:
  Fix the build
  
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.227 ZendEngine2/zend_execute_API.c:1.228
--- ZendEngine2/zend_execute_API.c:1.227        Tue Aug  5 06:24:40 2003
+++ ZendEngine2/zend_execute_API.c      Tue Aug  5 19:50:59 2003
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute_API.c,v 1.227 2003/08/05 10:24:40 zeev Exp $ */
+/* $Id: zend_execute_API.c,v 1.228 2003/08/05 23:50:59 sniper Exp $ */
 
 #include <stdio.h>
 #include <signal.h>
@@ -33,14 +33,14 @@
 #include <sys/time.h>
 #endif
 
-
 ZEND_API void (*zend_execute)(zend_op_array *op_array TSRMLS_DC);
 ZEND_API void (*zend_execute_internal)(zend_execute_data *execute_data_ptr, int 
return_value_used TSRMLS_DC);
 
-#ifdef ZEND_WIN32
-#include <process.h>
 /* true global */
 ZEND_API zend_fcall_info_cache empty_fcall_info_cache = { NULL, NULL, NULL, 0 };
+
+#ifdef ZEND_WIN32
+#include <process.h>
 
 static WNDCLASS wc;
 static HWND timeout_window;
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.26 php-src/ext/curl/interface.c:1.27
--- php-src/ext/curl/interface.c:1.26   Tue Aug  5 06:29:02 2003
+++ php-src/ext/curl/interface.c        Tue Aug  5 19:50:59 2003
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: interface.c,v 1.26 2003/08/05 10:29:02 zeev Exp $ */
+/* $Id: interface.c,v 1.27 2003/08/05 23:50:59 sniper Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -562,7 +562,7 @@
                        fci.params = argv;
                        fci.no_separation = 0;
 
-                       error = zend_call_user_function(&fci, &t->fci_cache TSRMLS_CC);
+                       error = zend_call_function(&fci, &t->fci_cache TSRMLS_CC);
                        if (error == FAILURE) {
                                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not 
call the CURLOPT_HEADERFUNCTION");
                                length = -1;
Index: php-src/ext/curl/php_curl.h
diff -u php-src/ext/curl/php_curl.h:1.37 php-src/ext/curl/php_curl.h:1.38
--- php-src/ext/curl/php_curl.h:1.37    Tue Aug  5 06:29:03 2003
+++ php-src/ext/curl/php_curl.h Tue Aug  5 19:50:59 2003
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_curl.h,v 1.37 2003/08/05 10:29:03 zeev Exp $ */
+/* $Id: php_curl.h,v 1.38 2003/08/05 23:50:59 sniper Exp $ */
 
 #ifndef _PHP_CURL_H
 #define _PHP_CURL_H
@@ -79,7 +79,7 @@
 
 typedef struct {
        zval            *func_name;
-       zend_fcall_info fci_cache;
+       zend_fcall_info_cache fci_cache;
        FILE            *fp;
        smart_str       buf;
        int             method;
@@ -88,7 +88,7 @@
 
 typedef struct {
        zval            *func_name;
-       zend_fcall_info fci_cache;
+       zend_fcall_info_cache fci_cache;
        FILE            *fp;
        long            fd;
        int             method;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php