* attempt to be smarter than windows ;)

# seems that the regarding code in curl/multi.h that should prevent winsock(2) troubles does not take effect as it is intended

diff --git a/http.c b/http.c
index c68f61d33740edadcb30c762f0adf6fbba3bec69..1261de8a3855470840f66c392b32339ba0561e81 100644 (file)
--- a/http.c
+++ b/http.c
@@ -22,9 +22,7 @@
 
 #ifdef HTTP_HAVE_CURL
 #      ifdef PHP_WIN32
-#              define _WINSOCKAPI_
 #              include <winsock2.h>
-#              include <sys/types.h>
 #      endif
 #      include <curl/curl.h>
 #endif

diff --git a/http.dsp b/http.dsp
index 279552719cdbfd80aa3b96d1b387ea2431c5d55d..288eb2c71abe642122ef03e143f44ca4c58a0739 100644 (file)
--- a/http.dsp
+++ b/http.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_HTTP" /D ZTS=1 /YX /FD /c\r
-# ADD CPP /nologo /Gd /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HTTP_EXPORTS" /D "COMPILE_DL_HTTP" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_HTTP=1 /D HTTP_HAVE_CURL=1 /FR /YX /FD /c\r
+# ADD CPP /nologo /Gd /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HTTP_EXPORTS" /D "COMPILE_DL_HTTP" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_HTTP=1 /D HTTP_HAVE_CURL=1 /D "_WINSOCKAPI_" /FR /YX /FD /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x406 /d "NDEBUG"\r
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_HTTP" /D ZTS=1 /YX /FD /c\r
-# ADD CPP /nologo /MDd /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HTTP_EXPORTS" /D "COMPILE_DL_HTTP" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_HTTP=1 /D HTTP_HAVE_CURL=1 /YX /FD /c\r
+# ADD CPP /nologo /MDd /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HTTP_EXPORTS" /D "COMPILE_DL_HTTP" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_HTTP=1 /D HTTP_HAVE_CURL=1 /D "_WINSOCKAPI_" /YX /FD /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x406 /d "NDEBUG"\r

diff --git a/http_api.c b/http_api.c
index 554c648ac1dbd7ef1135a81b86ff05347901f9bb..6567e6b487894dcf56ac163c2a97f4efd5bcbdfe 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -22,7 +22,6 @@
 #include <ctype.h>
 
 #ifdef PHP_WIN32
-#      define _WINSOCKAPI_
 #      include <winsock2.h>
 #elif defined(HAVE_NETDB_H)
 #      include <netdb.h>

diff --git a/http_curl_api.c b/http_curl_api.c
index b4a8077b299cb30c361437efd84fdae0dd8ffcc3..6e96940daf7ad77da0c906f18286d4a0ab9a4623 100644 (file)
--- a/http_curl_api.c
+++ b/http_curl_api.c
@@ -20,13 +20,10 @@
 #endif
 
 #ifdef PHP_WIN32
-#      define _WINSOCKAPI_
 #      include <winsock2.h>
-#      include <sys/types.h>
 #endif
 
 #include <curl/curl.h>
-#include <curl/easy.h>
 
 #include "php.h"
 #include "php_http.h"

diff --git a/php_http.h b/php_http.h
index e6191c820025001ba956a22e02e880e3ce06c889..ea2c2559e0262b81f666cb6f131567ac84d53996 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -43,7 +43,6 @@ typedef struct {
 #ifdef HTTP_HAVE_CURL
 
 #ifdef PHP_WIN32
-#      define _WINSOCKAPI_
 #      include <winsock2.h>
 #endif
 

diff --git a/php_http_curl_api.h b/php_http_curl_api.h
index ca0f29202017b612f0623243bf46f42ccb2a5293..5e3d3e11fa651010a3b9d09483a26474aa10e0e8 100644 (file)
--- a/php_http_curl_api.h
+++ b/php_http_curl_api.h
@@ -19,7 +19,6 @@
 #define PHP_HTTP_CURL_API_H
 
 #ifdef PHP_WIN32
-#      define _WINSOCKAPI_
 #      include <winsock2.h>
 #endif