From 0be5cca176792001bda27cf07861e0716d4f52fe Mon Sep 17 00:00:00 2001 From: "Frank M. Kromann" Date: Mon, 23 Apr 2001 17:33:22 +0000 Subject: [PATCH] Fix build on WIn32 Should the new directorys be static? --- main/config.w32.h | 11 ++++++++++- main/php_ini.c | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) 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" -- 2.50.1