edink Wed Jan 4 12:56:09 2006 UTC
Modified files: (Branch: PHP_4_4)
/php-src/ext/imap imap.dsp php_imap.c
Log:
Fix win32 build
http://cvs.php.net/viewcvs.cgi/php-src/ext/imap/imap.dsp?r1=1.14.14.1&r2=1.14.14.2&diff_format=u
Index: php-src/ext/imap/imap.dsp
diff -u php-src/ext/imap/imap.dsp:1.14.14.1 php-src/ext/imap/imap.dsp:1.14.14.2
--- php-src/ext/imap/imap.dsp:1.14.14.1 Sat Oct 29 21:53:35 2005
+++ php-src/ext/imap/imap.dsp Wed Jan 4 12:56:09 2006
@@ -123,7 +123,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "IMAP_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\main" /I "..\..\Zend"
/I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\php_build\imap\c-client"
/D "ZTS" /D "NDEBUG" /D "IMAP_EXPORTS" /D "COMPILE_DL_IMAP" /D HAVE_IMAP=1 /D
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D
ZEND_DEBUG=0 /D HAVE_IMAP2001=1 /D HAVE_IMAP2004=1 /D HAVE_IMAP_SSL=1 /FR /YX
/FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\main" /I "..\..\Zend"
/I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\php_build\imap\c-client"
/I "..\..\..\php_build\include\c-client" /D "ZTS" /D "NDEBUG" /D "IMAP_EXPORTS"
/D "COMPILE_DL_IMAP" /D HAVE_IMAP=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZEND_DEBUG=0 /D HAVE_IMAP2001=1 /D
HAVE_IMAP2004=1 /D HAVE_IMAP_SSL=1 /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40d /d "NDEBUG"
http://cvs.php.net/viewcvs.cgi/php-src/ext/imap/php_imap.c?r1=1.142.2.44.2.2&r2=1.142.2.44.2.3&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.142.2.44.2.2
php-src/ext/imap/php_imap.c:1.142.2.44.2.3
--- php-src/ext/imap/php_imap.c:1.142.2.44.2.2 Sun Jan 1 13:46:53 2006
+++ php-src/ext/imap/php_imap.c Wed Jan 4 12:56:09 2006
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.142.2.44.2.2 2006/01/01 13:46:53 sniper Exp $ */
+/* $Id: php_imap.c,v 1.142.2.44.2.3 2006/01/04 12:56:09 edink Exp $ */
#define IMAP41
@@ -51,7 +51,7 @@
#include <signal.h>
#ifdef PHP_WIN32
-#include <winsock2.h>
+#include <winsock.h>
#include <stdlib.h>
#include "win32/sendmail.h"
MAILSTREAM DEFAULTPROTO;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
