diff options
| author | foobar <sniper@php.net> | 2002-04-23 03:01:30 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2002-04-23 03:01:30 +0000 |
| commit | dace2eca0344c25c3bd383e4cdb58e9c323d72ef (patch) | |
| tree | ad762ece6d1956e5e6179a503f40cb92caeebbb9 /sapi/apache/sapi_apache.c | |
| parent | eb18c5c38c9335f48a30aa856aa97ff285dd6aef (diff) | |
| download | php-git-dace2eca0344c25c3bd383e4cdb58e9c323d72ef.tar.gz | |
Part 4 of apache sapi build fixes:
- Fixed many conflicts caused by bogus includes, e.g the infamous XtOffset
redefinition warning is gone now.
Diffstat (limited to 'sapi/apache/sapi_apache.c')
| -rw-r--r-- | sapi/apache/sapi_apache.c | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c index ae2c827a6e..aa935b90db 100644 --- a/sapi/apache/sapi_apache.c +++ b/sapi/apache/sapi_apache.c @@ -21,42 +21,7 @@ */ /* $Id$ */ -#define NO_REGEX_EXTRA_H -#ifdef WIN32 -#include <winsock2.h> -#include <stddef.h> -#endif - -#include "php.h" - -#include "httpd.h" -#include "http_config.h" -#if MODULE_MAGIC_NUMBER > 19980712 -# include "ap_compat.h" -#else -# if MODULE_MAGIC_NUMBER > 19980324 -# include "compat.h" -# endif -#endif -#include "http_core.h" -#include "http_main.h" -#include "http_protocol.h" -#include "http_request.h" -#include "http_log.h" - -#include "zend.h" -#include "php_ini.h" -#include "php_globals.h" -#include "SAPI.h" -#include "php_main.h" -#include "zend_compile.h" -#include "zend_execute.h" -#include "zend_highlight.h" -#include "zend_indent.h" -#include "ext/standard/php_standard.h" -#include "util_script.h" -#include "php_version.h" -#include "mod_php4.h" +#include "php_apache_http.h" /* {{{ apache_php_module_main */ |