diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2009-12-03 11:50:32 +0000 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2009-12-03 11:50:32 +0000 |
| commit | 1063c8346bd319ac3ca5fd6531442ff8fc8ec66c (patch) | |
| tree | fe19b76eef0ab990cc880474a8bf6e6ee3e58e3d /main | |
| parent | 0f0f5f229b18e27d07e820cc3863d5dc9ea95fd0 (diff) | |
| download | php-git-1063c8346bd319ac3ca5fd6531442ff8fc8ec66c.tar.gz | |
MFT: VC10 build support
Diffstat (limited to 'main')
| -rw-r--r-- | main/php_network.h | 14 | ||||
| -rw-r--r-- | main/streams/php_streams_int.h | 5 |
2 files changed, 14 insertions, 5 deletions
diff --git a/main/php_network.h b/main/php_network.h index 9f552f352b..1109bfbd35 100644 --- a/main/php_network.h +++ b/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 diff --git a/main/streams/php_streams_int.h b/main/streams/php_streams_int.h index 9dc4496a3e..3edb5efbc8 100644 --- a/main/streams/php_streams_int.h +++ b/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 |