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 /ext/mime_magic | |
| 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 'ext/mime_magic')
| -rw-r--r-- | ext/mime_magic/mime_magic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/mime_magic/mime_magic.c b/ext/mime_magic/mime_magic.c index cd4914a040..7df87f1f6f 100644 --- a/ext/mime_magic/mime_magic.c +++ b/ext/mime_magic/mime_magic.c @@ -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) |