summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorFrank M. Kromann <fmk@php.net>2001-04-23 17:33:22 +0000
committerFrank M. Kromann <fmk@php.net>2001-04-23 17:33:22 +0000
commit0be5cca176792001bda27cf07861e0716d4f52fe (patch)
treeee51fbde7e96037b6c3654f0ae3149dbd6548b71 /main
parentc03efd49f4244c6d3d3d1b8dc14557ef310f504f (diff)
downloadphp-git-0be5cca176792001bda27cf07861e0716d4f52fe.tar.gz
Fix build on WIn32
Should the new directorys be static?
Diffstat (limited to 'main')
-rw-r--r--main/config.w32.h11
-rw-r--r--main/php_ini.c2
2 files changed, 12 insertions, 1 deletions
diff --git a/main/config.w32.h b/main/config.w32.h
index 9a5f178360..4f5c0e19eb 100644
--- 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 fe3121cf77..61eb02ab38 100644
--- 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"