diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 1999-10-30 14:22:10 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 1999-10-30 14:22:10 +0000 |
| commit | cf0868fec89a1fcac53ff8421f9cf0d9345310c5 (patch) | |
| tree | b6960232979da1ea74d39eefe06b13f8f4823069 /sapi | |
| parent | bbb1a4f8eb5ba01ea783845182edf17a1711150d (diff) | |
| download | php-git-cf0868fec89a1fcac53ff8421f9cf0d9345310c5.tar.gz | |
Clean up regex header file mess. php.h now explicitly includes php_regex.h
and php_regex.h figures out which regex header files to include and
defines symbols that prevents other stuff from including the wrong versions
of regex header files.
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/apache/mod_php4.c | 5 | ||||
| -rw-r--r-- | sapi/apache/sapi_apache.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c index aff778db0b..5d693a3982 100644 --- a/sapi/apache/mod_php4.c +++ b/sapi/apache/mod_php4.c @@ -19,6 +19,9 @@ */ /* $Id$ */ +#include "zend.h" +#include "php.h" + #include "httpd.h" #include "http_config.h" #if MODULE_MAGIC_NUMBER > 19980712 @@ -34,8 +37,6 @@ #include "http_request.h" #include "http_log.h" -#include "zend.h" -#include "php.h" #include "php_ini.h" #include "php_globals.h" #include "SAPI.h" diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c index 0e8b8029af..3676b2d13a 100644 --- a/sapi/apache/sapi_apache.c +++ b/sapi/apache/sapi_apache.c @@ -21,6 +21,8 @@ */ /* $Id$ */ +#include "php.h" + #include "httpd.h" #include "http_config.h" #if MODULE_MAGIC_NUMBER > 19980712 @@ -37,7 +39,6 @@ #include "http_log.h" #include "zend.h" -#include "php.h" #include "php_ini.h" #include "php_globals.h" #include "SAPI.h" |