From: foobar <sniper@php.net>
Date: Sun, 9 Feb 2003 19:10:32 +0000 (+0000)
Subject: MFH: fixed compile failures when ZLIB/PCRE are compiled as shared in same
X-Git-Tag: php-4.3.2RC1~292
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=50ac9e5aef306e2270d4f497c2a60f71dbc460e1;p=php

MFH: fixed compile failures when ZLIB/PCRE are compiled as shared in same
build.
---

diff --git a/ext/mime_magic/mime_magic.c b/ext/mime_magic/mime_magic.c
index 38210b1d86..6f44363e09 100644
--- a/ext/mime_magic/mime_magic.c
+++ b/ext/mime_magic/mime_magic.c
@@ -194,7 +194,7 @@ static long from_oct(int, char *);
 static int fsmagic(char *fn TSRMLS_DC);
 
 
-#if HAVE_ZLIB
+#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
 static int zmagic(unsigned char *, int);
 #endif
 
@@ -1020,7 +1020,7 @@ static void tryit(unsigned char *buf, int nb, int checkzmagic)
     /*
      * Try compression stuff
      */
-#if HAVE_ZLIB
+#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
 	if (checkzmagic == 1) {  
 		if (zmagic(buf, nb) == 1)
 			return;
@@ -1569,7 +1569,7 @@ static int mcheck(union VALUETYPE *p, struct magic *m)
     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)
diff --git a/ext/standard/aggregation.c b/ext/standard/aggregation.c
index 892918af95..90f60f964f 100644
--- a/ext/standard/aggregation.c
+++ b/ext/standard/aggregation.c
@@ -508,7 +508,7 @@ PHP_FUNCTION(aggregate_properties_by_list)
 }
 /* }}} */
 
-#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)
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index ee97d0b87a..699a5f5d24 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -865,7 +865,7 @@ function_entry basic_functions[] = {
 	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
diff --git a/ext/standard/image.c b/ext/standard/image.c
index 8ed5de1102..eefec586da 100644
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -34,7 +34,7 @@
 #endif
 #include "php_image.h"
 
-#if HAVE_ZLIB
+#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
 #include "zlib.h"
 #endif
 
@@ -80,7 +80,7 @@ PHP_MINIT_FUNCTION(imagetypes)
 	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);
@@ -170,7 +170,7 @@ static unsigned long int php_swf_get_bits (unsigned char* buffer, unsigned int p
 }
 /* }}} */
 
-#if HAVE_ZLIB
+#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
 /* {{{ php_handle_swc
  */
 static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC)
@@ -944,7 +944,7 @@ PHP_FUNCTION(getimagesize)
 		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;
diff --git a/main/SAPI.c b/main/SAPI.c
index a11f98c953..2f4dd43d35 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)) {
diff --git a/main/output.c b/main/output.c
index 89a816b73c..044804dbb2 100644
--- a/main/output.c
+++ b/main/output.c
@@ -24,7 +24,7 @@
 #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 @@ PHPAPI int php_ob_init_conflict(char *handler_new, char *handler_set TSRMLS_DC)
 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;
 		}