Permalink
Browse files

Restored the good part of 74ee335 that was just reverted.

  • Loading branch information...
1 parent c6e1545 commit 067603106eba10e7648ccfe11834b10580fde2a9 @cataphract cataphract committed Mar 28, 2012
Showing with 2 additions and 0 deletions.
  1. +2 −0 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)

0 comments on commit 0676031

Please sign in to comment.