archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed compile failures when ZLIB / PCRE are compiled as shared

Browse source 
extensions in same build.
This commit is contained in:
foobar 2003-02-09 19:09:52 +00:00
parent 7d46becbb2
commit a09e1397c7
6 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/mime_magic/mime_magic.c
View file

@ -192,7 +192,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
@ -1057,7 +1057,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;
@ -1606,7 +1606,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)

2
ext/standard/aggregation.c
View file

@ -524,7 +524,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)

2
ext/standard/basic_functions.c
View file

@ -886,7 +886,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

8
ext/standard/image.c
View file

@ -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 @@ 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);
@ -176,7 +176,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)
@ -1212,7 +1212,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;

6
main/SAPI.c
View file

@ -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)) {

4
main/output.c
View file

@ -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;
}