(hope) fix some win32 build errors

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 3286543f516d0b05e06d1e0353873b3bba4d81f1..590c14af2a1268f2989a9f8bbe497c63d9102709 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -18,6 +18,8 @@
 
 /* $Id$ */
 
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -44,8 +46,6 @@
 #include "ext/standard/file.h"
 #include "php_curl.h"
 
-static unsigned char second_arg_force_ref[] = {2, BYREF_NONE, BYREF_FORCE};
-
 static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC);
 
 #define SAVE_CURL_ERROR(__handle, __err) (__handle)->err.no = (int) __err;

diff --git a/ext/curl/multi.c b/ext/curl/multi.c
index ea87c7a9294d9847f133de9442a0db3150482466..6bd8fd601367c1583a9be9fc5d31763551fc33ba 100644 (file)
--- a/ext/curl/multi.c
+++ b/ext/curl/multi.c
@@ -16,7 +16,9 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: */ 
+/* $Id$ */
+
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #include "php.h"
 
@@ -27,10 +29,21 @@
 #include <curl/curl.h>
 #include <curl/multi.h>
 
+#ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
+#endif
+
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 /* {{{ proto resource curl_multi_init(void)
    Returns a new cURL multi handle */