From 067603106eba10e7648ccfe11834b10580fde2a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustavo=20Andr=C3=A9=20dos=20Santos=20Lopes?=
 <cataphract@php.net>
Date: Wed, 28 Mar 2012 08:43:41 +0100
Subject: Restored the good part of 74ee335 that was just reverted.

---
 ext/fileinfo/libmagic/magic.c | 2 ++
 1 file changed, 2 insertions(+)

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)
-- 
cgit v1.2.1