sniper Sun Feb 9 14:09:52 2003 EDT Modified files: /php4/ext/mime_magic mime_magic.c /php4/ext/standard aggregation.c basic_functions.c image.c /php4/main SAPI.c output.c Log: Fixed compile failures when ZLIB / PCRE are compiled as shared extensions in same build. Index: php4/ext/mime_magic/mime_magic.c diff -u php4/ext/mime_magic/mime_magic.c:1.26 php4/ext/mime_magic/mime_magic.c:1.27 --- php4/ext/mime_magic/mime_magic.c:1.26 Sun Jan 26 04:13:31 2003 +++ php4/ext/mime_magic/mime_magic.c Sun Feb 9 14:09:49 2003 @@ -15,7 +15,7 @@ | Author: Hartmut Holzgraefe <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ - $Id: mime_magic.c,v 1.26 2003/01/26 09:13:31 sander Exp $ + $Id: mime_magic.c,v 1.27 2003/02/09 19:09:49 sniper Exp $ This module contains a lot of stuff taken from Apache mod_mime_magic, so the license section is a little bit longer than usual: @@ -192,7 +192,7 @@ static int fsmagic(char *fn TSRMLS_DC); -#if HAVE_ZLIB +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) static int zmagic(unsigned char *, int); #endif @@ -1057,7 +1057,7 @@ /* * Try compression stuff */ -#if HAVE_ZLIB +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) if (checkzmagic == 1) { if (zmagic(buf, nb) == 1) return; @@ -1606,7 +1606,7 @@ return matched; } -#if HAVE_ZLIB +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) /* * compress routines: zmagic() - returns 0 if not recognized, uncompresses * and prints information if recognized uncompress(s, method, old, n, newch) Index: php4/ext/standard/aggregation.c diff -u php4/ext/standard/aggregation.c:1.17 php4/ext/standard/aggregation.c:1.18 --- php4/ext/standard/aggregation.c:1.17 Sun Feb 9 13:47:21 2003 +++ php4/ext/standard/aggregation.c Sun Feb 9 14:09:50 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: aggregation.c,v 1.17 2003/02/09 18:47:21 sniper Exp $ */ +/* $Id: aggregation.c,v 1.18 2003/02/09 19:09:50 sniper Exp $ */ #include "php.h" #include "basic_functions.h" @@ -524,7 +524,7 @@ } /* }}} */ -#if HAVE_PCRE || HAVE_BUNDLED_PCRE +#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) /* {{{ proto void aggregate_methods_by_regexp(object obj, string class, string regexp [, bool exclude]) */ PHP_FUNCTION(aggregate_methods_by_regexp) Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.574 php4/ext/standard/basic_functions.c:1.575 --- php4/ext/standard/basic_functions.c:1.574 Sat Feb 8 22:49:41 2003 +++ php4/ext/standard/basic_functions.c Sun Feb 9 14:09:50 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.574 2003/02/09 03:49:41 shane Exp $ */ +/* $Id: basic_functions.c,v 1.575 2003/02/09 19:09:50 sniper Exp $ */ #include "php.h" #include "php_streams.h" @@ -886,7 +886,7 @@ PHP_FE(aggregate_methods_by_list, first_arg_force_ref) PHP_FE(aggregate_properties, first_arg_force_ref) PHP_FE(aggregate_properties_by_list, first_arg_force_ref) -#if HAVE_PCRE || HAVE_BUNDLED_PCRE +#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) PHP_FE(aggregate_methods_by_regexp, first_arg_force_ref) PHP_FE(aggregate_properties_by_regexp, first_arg_force_ref) #endif Index: php4/ext/standard/image.c diff -u php4/ext/standard/image.c:1.88 php4/ext/standard/image.c:1.89 --- php4/ext/standard/image.c:1.88 Sat Feb 1 18:38:29 2003 +++ php4/ext/standard/image.c Sun Feb 9 14:09:51 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: image.c,v 1.88 2003/02/01 23:38:29 helly Exp $ */ +/* $Id: image.c,v 1.89 2003/02/09 19:09:51 sniper Exp $ */ #include "php.h" #include <stdio.h> @@ -34,7 +34,7 @@ #endif #include "php_image.h" -#if HAVE_ZLIB +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) #include "zlib.h" #endif @@ -83,7 +83,7 @@ REGISTER_LONG_CONSTANT("IMAGETYPE_JP2", IMAGE_FILETYPE_JP2, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("IMAGETYPE_JPX", IMAGE_FILETYPE_JPX, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("IMAGETYPE_JB2", IMAGE_FILETYPE_JB2, CONST_CS | CONST_PERSISTENT); -#if HAVE_ZLIB +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) REGISTER_LONG_CONSTANT("IMAGETYPE_SWC", IMAGE_FILETYPE_SWC, CONST_CS | CONST_PERSISTENT); #endif REGISTER_LONG_CONSTANT("IMAGETYPE_IFF", IMAGE_FILETYPE_IFF, CONST_CS | CONST_PERSISTENT); @@ -176,7 +176,7 @@ } /* }}} */ -#if HAVE_ZLIB +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) /* {{{ php_handle_swc */ static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC) @@ -1212,7 +1212,7 @@ case IMAGE_FILETYPE_SWF: result = php_handle_swf(stream TSRMLS_CC); break; -#if HAVE_ZLIB +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) case IMAGE_FILETYPE_SWC: result = php_handle_swc(stream TSRMLS_CC); break; Index: php4/main/SAPI.c diff -u php4/main/SAPI.c:1.163 php4/main/SAPI.c:1.164 --- php4/main/SAPI.c:1.163 Tue Jan 21 06:03:57 2003 +++ php4/main/SAPI.c Sun Feb 9 14:09:51 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: SAPI.c,v 1.163 2003/01/21 11:03:57 sas Exp $ */ +/* $Id: SAPI.c,v 1.164 2003/02/09 19:09:51 sniper Exp $ */ #include <ctype.h> #include <sys/stat.h> @@ -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 @@ 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 @@ 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)) { Index: php4/main/output.c diff -u php4/main/output.c:1.147 php4/main/output.c:1.148 --- php4/main/output.c:1.147 Mon Feb 3 18:36:19 2003 +++ php4/main/output.c Sun Feb 9 14:09:52 2003 @@ -18,13 +18,13 @@ +----------------------------------------------------------------------+ */ -/* $Id: output.c,v 1.147 2003/02/03 23:36:19 hholzgra Exp $ */ +/* $Id: output.c,v 1.148 2003/02/09 19:09:52 sniper Exp $ */ #include "php.h" #include "ext/standard/head.h" #include "ext/standard/basic_functions.h" #include "ext/standard/url_scanner_ex.h" -#ifdef HAVE_ZLIB +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) #include "ext/zlib/php_zlib.h" #endif #include "SAPI.h" @@ -408,7 +408,7 @@ static int php_ob_init_named(uint initial_size, uint block_size, char *handler_name, zval *output_handler, uint chunk_size, zend_bool erase TSRMLS_DC) { if (OG(ob_nesting_level)>0) { -#ifdef HAVE_ZLIB +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) if (!strncmp(handler_name, "ob_gzhandler", sizeof("ob_gzhandler")) && php_ob_gzhandler_check(TSRMLS_C)) { return FAILURE; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php