From: Felipe Pena <felipe@php.net>
Date: Fri, 10 Sep 2010 21:33:50 +0000 (+0000)
Subject: - Fixed bug #49215 (make fails on glob_wrapper)
X-Git-Tag: php-5.3.4RC1~250
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ca2ea71094c464be1ae6695564dda6eeca9c250;p=php

- Fixed bug #49215 (make fails on glob_wrapper)
---

diff --git a/NEWS b/NEWS
index de59aad5ab..b989414398 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 0ff4f50e29..48c4031a33 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: