From: Michael Wallner <mike@php.net>
Date: Thu, 10 Mar 2005 12:41:45 +0000 (+0000)
Subject: * attempt to be smarter than windows ;)
X-Git-Tag: RELEASE_0_7_0~38
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=adeb28c27b5ee0ce27d477a42815f8fdee8bf9fe;hp=d6a9379d1794b38dc6868dd6486aedb63c993332

* 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 c68f61d..1261de8 100644
--- 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 2795527..288eb2c 100644
--- a/http.dsp
+++ b/http.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # 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
-# 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
+# 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
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x406 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # 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
-# 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
+# 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
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x406 /d "NDEBUG"
diff --git a/http_api.c b/http_api.c
index 554c648..6567e6b 100644
--- 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 b4a8077..6e96940 100644
--- 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 e6191c8..ea2c255 100644
--- 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 ca0f292..5e3d3e1 100644
--- 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