diff --git a/NEWS b/NEWS index de59aad5aba..b989414398a 100644 --- a/NEWS +++ b/NEWS @@ -80,10 +80,11 @@ - Fixed bug #50481 (Storing many SPLFixedArray in an array crashes). (Felipe) - Fixed bug #52260 (dns_get_record fails with non-existing domain on Windows). (a_jelly_doughnut at phpbb dot com, Pierre) -- Fixed #50953, socket will not connect to IPv4 address when the host has both - IPv4 and IPv6 addresses, on Windows. (Gustavo, Pierre) -- Fixed #50524, proc_open on Windows does not respect cwd as it does on other - platforms. (Pierre) +- Fixed bug #50953 (socket will not connect to IPv4 address when the host has + both IPv4 and IPv6 addresses, on Windows). (Gustavo, Pierre) +- Fixed bug #50524 (proc_open on Windows does not respect cwd as it does on + other platforms). (Pierre) +- Fixed bug #49215 (make fails on glob_wrapper). (Felipe) 22 Jul 2010, PHP 5.3.3 - Upgraded bundled sqlite to version 3.6.23.1. (Ilia) diff --git a/main/streams/glob_wrapper.c b/main/streams/glob_wrapper.c index 0ff4f50e297..48c4031a331 100755 --- a/main/streams/glob_wrapper.c +++ b/main/streams/glob_wrapper.c @@ -29,6 +29,7 @@ # endif #endif +#ifdef HAVE_GLOB #ifndef GLOB_ONLYDIR #define GLOB_ONLYDIR (1<<30) #define GLOB_FLAGMASK (~GLOB_ONLYDIR) @@ -278,6 +279,7 @@ php_stream_wrapper php_glob_stream_wrapper = { NULL, 0 }; +#endif /* HAVE_GLOB */ /* * Local variables: