Fix build on WIn32

Should the new directorys be static?

diff --git a/main/config.w32.h b/main/config.w32.h
index 9a5f178360cfb914d46486f74816fea15cef66fc..4f5c0e19ebbcd3c4b884ac3a519b3d903ddcc788 100644 (file)
--- a/main/config.w32.h
+++ b/main/config.w32.h
@@ -1,5 +1,5 @@
 /* config.w32.h.  Configure file for win32 platforms  */
-/* tested only with MS Visual C++ V5 */
+/* tested only with MS Visual C++ V6 */
 
 
 /* Define if PHP to setup it's own SIGCHLD handler (not needed on Win32) */
@@ -325,3 +325,12 @@
 #define PHP_EXTENSION_DIR NULL
 
 #define SIZEOF_INT 4
+
+/* Define directory constants for php and pear */
+#define PHP_BINDIR "c:\\php4"
+#define PHP_LIBDIR "c:\\php4"
+#define PHP_DATADIR "c:\\php4"
+#define PHP_SYSCONFDIR "c:\\php4"
+#define PHP_LOCALSTATEDIR "c:\\php4"
+#define PHP_CONFIG_FILE_PATH "c:\\winnt"
+#define PEAR_INSTALLDIR "c:\\php4\\pear"

diff --git a/main/php_ini.c b/main/php_ini.c
index fe3121cf77b98899594af5fb5a2491717fc1e05b..61eb02ab38c6f93fea0902c99da19014722c2d9c 100644 (file)
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -18,7 +18,9 @@
 
 
 #include "php.h"
+#ifndef PHP_WIN32
 #include "build-defs.h"
+#endif
 #include "ext/standard/info.h"
 #include "zend_ini.h"
 #include "php_ini.h"