diff options
| author | Anatol Belski <ab@php.net> | 2014-08-22 08:58:03 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-22 08:58:03 +0200 |
| commit | 79f888a602db3814a6ab03183eff6375bfe9234a (patch) | |
| tree | f1b6d1fb76ca4d613a5cc1b551057dac33d3f585 /sapi/apache2handler/php_apache.h | |
| parent | da35db3ec5fc4b27087292c067a6ea1d0f77bf8f (diff) | |
| parent | 411b920a6f8d53025caddb30895b27d04a3576b4 (diff) | |
| download | php-git-POST_64BIT_BRANCH_MERGE.tar.gz | |
Merge remote-tracking branch 'weltling/master'POST_64BIT_BRANCH_MERGE
* weltling/master: (725 commits)
fix zpp
fixed array_pad()
fix zpp
fix zpp
fix zpp
fix zpp and a bit more
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fixed the test
...
Diffstat (limited to 'sapi/apache2handler/php_apache.h')
| -rw-r--r-- | sapi/apache2handler/php_apache.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h index 34846048b0..10b4186306 100644 --- a/sapi/apache2handler/php_apache.h +++ b/sapi/apache2handler/php_apache.h @@ -25,6 +25,9 @@ #include "http_config.h" #include "http_core.h" +#include "php.h" +#include "main/php_streams.h" + /* Declare this so we can get to it from outside the sapi_apache2.c file */ extern module AP_MODULE_DECLARE_DATA php5_module; @@ -40,7 +43,7 @@ typedef struct php_struct { #if defined(NETWARE) && defined(CLIB_STAT_PATCH) struct stat_libc finfo; #else - struct stat finfo; + php_stat_t finfo; #endif /* Whether or not we've processed PHP in the output filters yet. */ int request_processed; |