com php-src: Restored the good part of 74ee335 that was just reverted.: ext/fileinfo/libmagic/magic.c

Commit: 067603106eba10e7648ccfe11834b10580fde2a9 Author: Gustavo André dos Santos Lopes <cataphract@php.net> Wed, 28 Mar 2012 08:43:41 +0100 Parents: c6e15455a3e7fa62c77728bf29638207f496ac1d Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=067603106eba10e7648ccfe11834b10580fde2a9 Log: Restored the good part of 74ee335 that was just reverted. Changed paths: M ext/fileinfo/libmagic/magic.c Diff: 067603106eba10e7648ccfe11834b10580fde2a9 diff --git a/ext/fileinfo/libmagic/magic.c b/ext/fileinfo/libmagic/magic.c index ff9da7f..b4818ae 100644 --- a/ext/fileinfo/libmagic/magic.c +++ b/ext/fileinfo/libmagic/magic.c @@ -92,6 +92,7 @@ private const char *file_or_stream(struct magic_set *, const char *, php_stream #endif /* XXX this functionality is excluded in php, enable it in apprentice.c:340 */ +#if 0 private const char * get_default_magic(void) { @@ -215,6 +216,7 @@ magic_getpath(const char *magicfile, int action) return action == FILE_LOAD ? get_default_magic() : MAGIC; } +#endif public struct magic_set * magic_open(int flags)