summaryrefslogtreecommitdiff
path: root/main/streams/php_streams_int.h
diff options
context:
space:
mode:
Diffstat (limited to 'main/streams/php_streams_int.h')
-rw-r--r--main/streams/php_streams_int.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/main/streams/php_streams_int.h b/main/streams/php_streams_int.h
index b0a1f3327..113c518aa 100644
--- a/main/streams/php_streams_int.h
+++ b/main/streams/php_streams_int.h
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
- | Copyright (c) 1997-2009 The PHP Group |
+ | Copyright (c) 1997-2010 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_streams_int.h 272370 2008-12-31 11:15:49Z sebastian $ */
+/* $Id: php_streams_int.h 293036 2010-01-03 09:23:27Z sebastian $ */
#if ZEND_DEBUG
@@ -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