svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/main/streams/glob_wrapper.c trunk/main/streams/glob_wrapper.c
| From: | Felipe Pena | Date: | Fri, 10 Sep 2010 21:33:50 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/main/streams/glob_wrapper.c trunk/main/streams/glob_wrapper.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-63468@lists.php.net to get a copy of this message | ||
felipe Fri, 10 Sep 2010 21:33:50 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=303265
Log:
- Fixed bug #49215 (make fails on glob_wrapper)
Bug: http://bugs.php.net/49215 (Open) make fails on
glob_wrapper
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/main/streams/glob_wrapper.c
U php/php-src/trunk/main/streams/glob_wrapper.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2010-09-10 19:27:39 UTC (rev 303264)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-09-10 21:33:50 UTC (rev 303265)
@@ -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)
Modified: php/php-src/branches/PHP_5_3/main/streams/glob_wrapper.c
===================================================================
--- php/php-src/branches/PHP_5_3/main/streams/glob_wrapper.c 2010-09-10 19:27:39 UTC (rev 303264)
+++ php/php-src/branches/PHP_5_3/main/streams/glob_wrapper.c 2010-09-10 21:33:50 UTC (rev 303265)
@@ -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 @@
NULL,
0
};
+#endif /* HAVE_GLOB */
/*
* Local variables:
Modified: php/php-src/trunk/main/streams/glob_wrapper.c
===================================================================
--- php/php-src/trunk/main/streams/glob_wrapper.c 2010-09-10 19:27:39 UTC (rev 303264)
+++ php/php-src/trunk/main/streams/glob_wrapper.c 2010-09-10 21:33:50 UTC (rev 303265)
@@ -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 @@
NULL,
0
};
+#endif /* HAVE_GLOB */
/*
* Local variables: