diff options
| author | Andi Gutmans <andi@php.net> | 2000-03-04 19:58:59 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2000-03-04 19:58:59 +0000 |
| commit | 0a092b6226a1866221a117713d01cea014b4f228 (patch) | |
| tree | c2834510c82cf8666b3f195a467e727c6b9fa310 /main | |
| parent | b1de472ba363d5a285a5d91e72931f770b3be798 (diff) | |
| download | php-git-0a092b6226a1866221a117713d01cea014b4f228.tar.gz | |
- Fix Win32 build
Diffstat (limited to 'main')
| -rw-r--r-- | main/php.h | 2 | ||||
| -rw-r--r-- | main/php_compat.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/main/php.h b/main/php.h index 2f8eb29a9d..b9668c0c41 100644 --- a/main/php.h +++ b/main/php.h @@ -59,7 +59,6 @@ extern unsigned char second_arg_allow_ref[]; #ifdef PHP_WIN32 -#include "config.w32.h" #include "win95nt.h" # ifdef PHP_EXPORTS # define PHPAPI __declspec(dllexport) @@ -67,7 +66,6 @@ extern unsigned char second_arg_allow_ref[]; # define PHPAPI __declspec(dllimport) # endif #else -#include "php_config.h" #define PHPAPI #define THREAD_LS #endif diff --git a/main/php_compat.h b/main/php_compat.h index 90b78c1710..c0726da009 100644 --- a/main/php_compat.h +++ b/main/php_compat.h @@ -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 |