Browse files

MFT: VC10 build support

  • Loading branch information...
1 parent 0f0f5f2 commit 1063c8346bd319ac3ca5fd6531442ff8fc8ec66c @KalleZ KalleZ committed Dec 3, 2009
Showing with 33 additions and 10 deletions.
  1. +6 −0 ext/sockets/sockets.c
  2. +6 −3 ext/standard/flock_compat.h
  3. +10 −4 main/php_network.h
  4. +4 −1 main/streams/php_streams_int.h
  5. +1 −1 win32/build/config.w32
  6. +6 −1 win32/php_stdint.h
View
6 ext/sockets/sockets.c
@@ -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
View
9 ext/standard/flock_compat.h
@@ -42,9 +42,12 @@ PHPAPI int flock(int fd, int operation);
#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
View
14 main/php_network.h
@@ -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
View
5 main/streams/php_streams_int.h
@@ -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
View
2 win32/build/config.w32
@@ -148,7 +148,7 @@ if (VCVERS >= 1400) {
}
}
-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') {
View
7 win32/php_stdint.h
@@ -238,7 +238,12 @@ typedef uint64_t uintmax_t;
#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 ]

0 comments on commit 1063c83

Please sign in to comment.