cvs: php-src(PHP_4_4) /main php_ini.c
| From: | Jani Taskinen | Date: | Wed, 31 Aug 2005 14:34:49 +0000 |
| Subject: | cvs: php-src(PHP_4_4) /main php_ini.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-33710@lists.php.net to get a copy of this message | ||
sniper Wed Aug 31 10:34:49 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/main php_ini.c
Log:
Fixed bug #32318
http://cvs.php.net/diff.php/php-src/main/php_ini.c?r1=1.106.2.15&r2=1.106.2.15.2.1&ty=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.106.2.15 php-src/main/php_ini.c:1.106.2.15.2.1
--- php-src/main/php_ini.c:1.106.2.15 Thu Sep 16 22:49:48 2004
+++ php-src/main/php_ini.c Wed Aug 31 10:34:46 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ini.c,v 1.106.2.15 2004/09/17 02:49:48 iliaa Exp $ */
+/* $Id: php_ini.c,v 1.106.2.15.2.1 2005/08/31 14:34:46 sniper Exp $ */
/* Check CWD for php.ini */
#define INI_CHECK_CWD
@@ -31,7 +31,9 @@
#include "SAPI.h"
#include "php_main.h"
#include "php_scandir.h"
+#ifdef PHP_WIN32
#include "win32/php_registry.h"
+#endif
#if HAVE_SCANDIR && HAVE_ALPHASORT && HAVE_DIRENT_H
#include <dirent.h>