cvs: /php4 php.h php4dllts.dsp php_compat.h
| From: | Andi Gutmans | Date: | Sat, 04 Mar 2000 19:59:29 +0000 |
| Subject: | cvs: /php4 php.h php4dllts.dsp php_compat.h | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-11522@lists.php.net to get a copy of this message | ||
andi Sat Mar 4 11:59:29 2000 EDT
Modified files:
/php4 php.h php4dllts.dsp php_compat.h
Log:
- Fix Win32 build
Index: php4/php.h
diff -u php4/php.h:1.66 php4/php.h:1.67
--- php4/php.h:1.66 Sat Mar 4 06:44:00 2000
+++ php4/php.h Sat Mar 4 11:58:59 2000
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.66 2000/03/04 14:44:00 sas Exp $ */
+/* $Id: php.h,v 1.67 2000/03/04 19:58:59 andi Exp $ */
#ifndef _PHP_H
#define _PHP_H
@@ -59,7 +59,6 @@
#ifdef PHP_WIN32
-#include "config.w32.h"
#include "win95nt.h"
# ifdef PHP_EXPORTS
# define PHPAPI __declspec(dllexport)
@@ -67,7 +66,6 @@
# define PHPAPI __declspec(dllimport)
# endif
#else
-#include "php_config.h"
#define PHPAPI
#define THREAD_LS
#endif
Index: php4/php4dllts.dsp
diff -u php4/php4dllts.dsp:1.59 php4/php4dllts.dsp:1.60
--- php4/php4dllts.dsp:1.59 Fri Feb 25 15:37:00 2000
+++ php4/php4dllts.dsp Sat Mar 4 11:58:59 2000
@@ -149,10 +149,6 @@
# End Source File
# Begin Source File
-SOURCE=.\php_ticks.c
-# End Source File
-# Begin Source File
-
SOURCE=.\mergesort.c
# End Source File
# Begin Source File
@@ -169,6 +165,10 @@
# End Source File
# Begin Source File
+SOURCE=.\php_ticks.c
+# End Source File
+# Begin Source File
+
SOURCE=.\php_variables.c
# End Source File
# Begin Source File
@@ -246,6 +246,10 @@
# Begin Source File
SOURCE=.\php3_compat.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\php_compat.h
# End Source File
# Begin Source File
Index: php4/php_compat.h
diff -u php4/php_compat.h:1.5 php4/php_compat.h:1.6
--- php4/php_compat.h:1.5 Sat Mar 4 06:44:00 2000
+++ php4/php_compat.h Sat Mar 4 11:58:59 2000
@@ -1,6 +1,12 @@
#ifndef PHP_COMPAT_H
#define PHP_COMPAT_H
+#ifdef PHP_WIN32
+#include "config.w32.h"
+#else
+#include "php_config.h"
+#endif
+
#if defined(HAVE_BUNDLED_PCRE) || !defined(PHP_VERSION)
#define pcre_compile php_pcre_compile
#define pcre_copy_substring php_pcre_copy_substring