cvs: php4 /main config.w32.h php_ini.c

fmk Mon Apr 23 10:33:22 2001 EDT Modified files: /php4/main config.w32.h php_ini.c Log: Fix build on WIn32 Should the new directorys be static? Index: php4/main/config.w32.h diff -u php4/main/config.w32.h:1.40 php4/main/config.w32.h:1.41 --- php4/main/config.w32.h:1.40 Sat Mar 10 19:49:21 2001 +++ php4/main/config.w32.h Mon Apr 23 10:33:22 2001 @@ -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" Index: php4/main/php_ini.c diff -u php4/main/php_ini.c:1.57 php4/main/php_ini.c:1.58 --- php4/main/php_ini.c:1.57 Sat Apr 21 18:09:13 2001 +++ php4/main/php_ini.c Mon Apr 23 10:33:22 2001 @@ -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"