diff options
| author | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-03-28 08:43:41 +0100 |
|---|---|---|
| committer | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-03-28 08:43:41 +0100 |
| commit | 067603106eba10e7648ccfe11834b10580fde2a9 (patch) | |
| tree | b37791eaced212d5c07fb6676ab4f11297b1a715 | |
| parent | c6e15455a3e7fa62c77728bf29638207f496ac1d (diff) | |
| download | php-git-067603106eba10e7648ccfe11834b10580fde2a9.tar.gz | |
Restored the good part of 74ee335 that was just reverted.
| -rw-r--r-- | ext/fileinfo/libmagic/magic.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/fileinfo/libmagic/magic.c b/ext/fileinfo/libmagic/magic.c index ff9da7f4fe..b4818aed55 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) |