kalle                                    Thu, 03 Dec 2009 10:17:58 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=291636

Log:
Use correct defines for VC10 support

Changed paths:
    U   php/php-src/trunk/ext/sockets/sockets.c
    U   php/php-src/trunk/ext/standard/flock_compat.h
    U   php/php-src/trunk/main/php_network.h
    U   php/php-src/trunk/main/streams/php_streams_int.h

Modified: php/php-src/trunk/ext/sockets/sockets.c
===================================================================
--- php/php-src/trunk/ext/sockets/sockets.c     2009-12-03 10:10:54 UTC (rev 
291635)
+++ php/php-src/trunk/ext/sockets/sockets.c     2009-12-03 10:17:58 UTC (rev 
291636)
@@ -41,12 +41,14 @@
 # include "php_sockets.h"
 # include "win32/sockets.h"
 # define IS_INVALID_SOCKET(a)  (a->bsd_socket == INVALID_SOCKET)
-# ifndef EPROTONOSUPPORT
-#  define EPROTONOSUPPORT      WSAEPROTONOSUPPORT
+# ifdef EPROTONOSUPPORT
+#  undef EPROTONOSUPPORT
 # endif
-# ifndef ECONNRESET
-#  define ECONNRESET           WSAECONNRESET
+# ifdef ECONNRESET
+#  undef ECONNRESET
 # endif
+# define EPROTONOSUPPORT WSAEPROTONOSUPPORT
+# define ECONNRESET WSAECONNRESET
 # ifdef errno
 #  undef errno
 # endif

Modified: php/php-src/trunk/ext/standard/flock_compat.h
===================================================================
--- php/php-src/trunk/ext/standard/flock_compat.h       2009-12-03 10:10:54 UTC 
(rev 291635)
+++ php/php-src/trunk/ext/standard/flock_compat.h       2009-12-03 10:17:58 UTC 
(rev 291636)
@@ -42,9 +42,10 @@
 #define PHP_LOCK_NB 4

 #ifdef PHP_WIN32
-# ifndef EWOULDBLOCK
-#  define EWOULDBLOCK WSAEWOULDBLOCK
+# ifdef EWOULDBLOCK
+#  undef EWOULDBLOCK
 # endif
+# define EWOULDBLOCK WSAEWOULDBLOCK
 # define fsync _commit
 # define ftruncate(a, b) chsize(a, b)
 #endif /* defined(PHP_WIN32) */

Modified: php/php-src/trunk/main/php_network.h
===================================================================
--- php/php-src/trunk/main/php_network.h        2009-12-03 10:10:54 UTC (rev 
291635)
+++ php/php-src/trunk/main/php_network.h        2009-12-03 10:17:58 UTC (rev 
291636)
@@ -34,12 +34,14 @@
 #endif

 #ifdef PHP_WIN32
-# ifndef EWOULDBLOCK
-#  define EWOULDBLOCK  WSAEWOULDBLOCK
+# ifdef EWOULDBLOCK
+#  undef EWOULDBLOCK
 # endif
-# ifndef EINPROGRESS
-#  define EINPROGRESS  WSAEWOULDBLOCK
-#endif
+# ifdef EINPROGRESS
+#  undef EINPROGRESS
+# endif
+# define EWOULDBLOCK WSAEWOULDBLOCK
+# define EINPROGRESS WSAEWOULDBLOCK
 # define fsync _commit
 # define ftruncate(a, b) chsize(a, b)
 #endif /* defined(PHP_WIN32) */

Modified: php/php-src/trunk/main/streams/php_streams_int.h
===================================================================
--- php/php-src/trunk/main/streams/php_streams_int.h    2009-12-03 10:10:54 UTC 
(rev 291635)
+++ php/php-src/trunk/main/streams/php_streams_int.h    2009-12-03 10:17:58 UTC 
(rev 291636)
@@ -48,8 +48,11 @@

 #define CHUNK_SIZE     8192

-#if defined(PHP_WIN32) && !defined(EWOULDBLOCK)
-#define EWOULDBLOCK WSAEWOULDBLOCK
+#ifdef PHP_WIN32
+# ifdef EWOULDBLOCK
+#  undef EWOULDBLOCK
+# endif
+# define EWOULDBLOCK WSAEWOULDBLOCK
 #endif

 #ifndef S_ISREG

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

Reply via email to