kalle Thu, 03 Dec 2009 11:50:32 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=291639
Log:
MFT: VC10 build support
Changed paths:
U php/php-src/branches/PHP_5_3/ext/sockets/sockets.c
U php/php-src/branches/PHP_5_3/ext/standard/flock_compat.h
U php/php-src/branches/PHP_5_3/main/php_network.h
U php/php-src/branches/PHP_5_3/main/streams/php_streams_int.h
U php/php-src/branches/PHP_5_3/win32/build/config.w32
U php/php-src/branches/PHP_5_3/win32/php_stdint.h
Modified: php/php-src/branches/PHP_5_3/ext/sockets/sockets.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/sockets/sockets.c 2009-12-03 10:50:02 UTC
(rev 291638)
+++ php/php-src/branches/PHP_5_3/ext/sockets/sockets.c 2009-12-03 11:50:32 UTC
(rev 291639)
@@ -41,6 +41,12 @@
# include "php_sockets.h"
# include "win32/sockets.h"
# define IS_INVALID_SOCKET(a) (a->bsd_socket == INVALID_SOCKET)
+# ifdef EPROTONOSUPPORT
+# undef EPROTONOSUPPORT
+# endif
+# ifdef ECONNRESET
+# undef ECONNRESET
+# endif
# define EPROTONOSUPPORT WSAEPROTONOSUPPORT
# define ECONNRESET WSAECONNRESET
# ifdef errno
Modified: php/php-src/branches/PHP_5_3/ext/standard/flock_compat.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/flock_compat.h 2009-12-03
10:50:02 UTC (rev 291638)
+++ php/php-src/branches/PHP_5_3/ext/standard/flock_compat.h 2009-12-03
11:50:32 UTC (rev 291639)
@@ -42,9 +42,12 @@
#define PHP_LOCK_NB 4
#ifdef PHP_WIN32
-#define EWOULDBLOCK WSAEWOULDBLOCK
-# define fsync _commit
-# define ftruncate(a, b) chsize(a, b)
+# ifdef EWOULDBLOCK
+# undef EWOULDBLOCK
+# endif
+# define EWOULDBLOCK WSAEWOULDBLOCK
+# define fsync _commit
+# define ftruncate(a, b) chsize(a, b)
#endif /* defined(PHP_WIN32) */
#if !HAVE_INET_ATON
Modified: php/php-src/branches/PHP_5_3/main/php_network.h
===================================================================
--- php/php-src/branches/PHP_5_3/main/php_network.h 2009-12-03 10:50:02 UTC
(rev 291638)
+++ php/php-src/branches/PHP_5_3/main/php_network.h 2009-12-03 11:50:32 UTC
(rev 291639)
@@ -34,10 +34,16 @@
#endif
#ifdef PHP_WIN32
-#define EWOULDBLOCK WSAEWOULDBLOCK
-#define EINPROGRESS WSAEWOULDBLOCK
-# define fsync _commit
-# define ftruncate(a, b) chsize(a, b)
+# ifdef EWOULDBLOCK
+# undef EWOULDBLOCK
+# 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) */
#ifndef EWOULDBLOCK
Modified: php/php-src/branches/PHP_5_3/main/streams/php_streams_int.h
===================================================================
--- php/php-src/branches/PHP_5_3/main/streams/php_streams_int.h 2009-12-03
10:50:02 UTC (rev 291638)
+++ php/php-src/branches/PHP_5_3/main/streams/php_streams_int.h 2009-12-03
11:50:32 UTC (rev 291639)
@@ -49,7 +49,10 @@
#define CHUNK_SIZE 8192
#ifdef PHP_WIN32
-#define EWOULDBLOCK WSAEWOULDBLOCK
+# ifdef EWOULDBLOCK
+# undef EWOULDBLOCK
+# endif
+# define EWOULDBLOCK WSAEWOULDBLOCK
#endif
#ifndef S_ISREG
Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32
===================================================================
--- php/php-src/branches/PHP_5_3/win32/build/config.w32 2009-12-03 10:50:02 UTC
(rev 291638)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2009-12-03 11:50:32 UTC
(rev 291639)
@@ -148,7 +148,7 @@
}
}
-ARG_WITH('mp', 'Tell VC9 use up to [n,auto,disable] processes for
compilation', 'auto');
+ARG_WITH('mp', 'Tell VC9+ use up to [n,auto,disable] processes for
compilation', 'auto');
if (VCVERS >= 1500 && PHP_MP != 'disable') {
// no from disable-all
if(PHP_MP == 'auto' || PHP_MP == 'no') {
Modified: php/php-src/branches/PHP_5_3/win32/php_stdint.h
===================================================================
--- php/php-src/branches/PHP_5_3/win32/php_stdint.h 2009-12-03 10:50:02 UTC
(rev 291638)
+++ php/php-src/branches/PHP_5_3/win32/php_stdint.h 2009-12-03 11:50:32 UTC
(rev 291639)
@@ -238,7 +238,12 @@
#define INTMAX_C INT64_C
#define UINTMAX_C UINT64_C
-static __inline int64_t llabs( int64_t i ) { return i >= 0? i: -i; }
+#if _MSC_VER < 1600
+static __inline int64_t llabs(int64_t i)
+{
+ return i >= 0 ? i: -i;
+}
+#endif
#endif // __STDC_CONSTANT_MACROS ]
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
