Fixed bug #80197

Use "libmagic/magic.h" rather than <magic.h> to make sure that we use the bundled libmagic, even if there is a system libmagic on the include path.
php · Jun 14, 2021 · 5dc31e0 · 5dc31e0
1 parent 876bf88
commit 5dc31e0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -16,6 +16,10 @@ PHP                                                                        NEWS
   . Fixed bug #81092 (fflush before stream_filter_remove corrupts stream).
     (cmb)
 
+- Fileinfo:
+  . Fixed bug #80197 (implicit declaration of function 'magic_stream' is
+    invalid). (Nikita)
+
 - GMP:
   . Fixed bug #81119 (GMP operators throw errors with wrong parameter names).
     (Nikita)

diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c
@@ -19,7 +19,7 @@
 #endif
 #include "php.h"
 
-#include <magic.h>
+#include "libmagic/magic.h"
 /*
  * HOWMANY specifies the maximum offset libmagic will look at
  * this is currently hardcoded in the libmagic source but not exported