diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /main/streams/php_streams_int.h | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'main/streams/php_streams_int.h')
| -rw-r--r-- | main/streams/php_streams_int.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/streams/php_streams_int.h b/main/streams/php_streams_int.h index ac0163ddb4..d59f0287df 100644 --- a/main/streams/php_streams_int.h +++ b/main/streams/php_streams_int.h @@ -49,7 +49,7 @@ #define CHUNK_SIZE 8192 #ifdef PHP_WIN32 -# ifdef EWOULDBLOCK +# ifdef EWOULDBLOCK # undef EWOULDBLOCK # endif # define EWOULDBLOCK WSAEWOULDBLOCK |