diff options
| author | foobar <sniper@php.net> | 2003-02-09 19:09:52 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2003-02-09 19:09:52 +0000 |
| commit | a09e1397c7a8510b13ad7cf6e49f5d96013975d5 (patch) | |
| tree | 56f599ef154f0282bc4c36b749599d01c2fb34c7 /main/SAPI.c | |
| parent | 7d46becbb2f03f607e04713f85a5a6f5d94d2a97 (diff) | |
| download | php-git-a09e1397c7a8510b13ad7cf6e49f5d96013975d5.tar.gz | |
Fixed compile failures when ZLIB / PCRE are compiled as shared
extensions in same build.
Diffstat (limited to 'main/SAPI.c')
| -rw-r--r-- | main/SAPI.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/SAPI.c b/main/SAPI.c index d23ec9a4ef..ed0b0a21f5 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -30,7 +30,7 @@ #if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) #include "ext/pcre/php_pcre.h" #endif -#if HAVE_ZLIB +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) #include "ext/zlib/php_zlib.h" ZEND_EXTERN_MODULE_GLOBALS(zlib) #endif @@ -556,7 +556,7 @@ SAPI_API int sapi_header_op(sapi_header_op_enum op, void *arg TSRMLS_DC) while (*ptr == ' ' && *ptr != '\0') { ptr++; } -#if HAVE_ZLIB +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) if(!strncmp(ptr, "image/", sizeof("image/")-1)) { ZLIBG(output_compression) = 0; } @@ -704,7 +704,7 @@ SAPI_API int sapi_send_headers(TSRMLS_D) return SUCCESS; } -#if HAVE_ZLIB +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) /* Add output compression headers at this late stage in order to make it possible to switch it off inside the script. */ if (ZLIBG(output_compression)) { |