Fixed bug #25155 (Possible namespace conflict between mime-magic & mssql)

diff --git a/ext/mime_magic/mime_magic.c b/ext/mime_magic/mime_magic.c
index 14cc6cae3f5bb92a1375daff77077b24eea64e0e..fdb296669181f31015167f75343ff2e8b4cc1a7e 100644 (file)
--- a/ext/mime_magic/mime_magic.c
+++ b/ext/mime_magic/mime_magic.c
@@ -168,6 +168,18 @@
 #define PHP_MIME_MAGIC_FILE_PATH PHP_PREFIX "\\magic.mime"
 #endif
 
+#define BYTE   1
+#define SHORT  2
+#define LONG   4
+#define STRING 5
+#define DATE   6
+#define BESHORT        7
+#define BELONG 8
+#define BEDATE 9
+#define LESHORT        10
+#define LELONG 11
+#define LEDATE 12
+
 static int apprentice(void);
 static int ascmagic(unsigned char *, int);
 static int is_tar(unsigned char *, int);

diff --git a/ext/mime_magic/php_mime_magic.h b/ext/mime_magic/php_mime_magic.h
index b9e33b84109a1b184964c2789f033154183d8c36..09f3cf47403f6b4f65fea26f14120634b1ae5b47 100644 (file)
--- a/ext/mime_magic/php_mime_magic.h
+++ b/ext/mime_magic/php_mime_magic.h
@@ -58,17 +58,6 @@ struct magic {
     unsigned char reln;                /* relation (0=eq, '>'=gt, etc) */
     char type;                 /* int, short, long or string. */
     char vallen;               /* length of string value, if any */
-#define BYTE    1
-#define SHORT    2
-#define LONG    4
-#define STRING    5
-#define DATE    6
-#define BESHORT    7
-#define BELONG    8
-#define BEDATE    9
-#define LESHORT    10
-#define LELONG    11
-#define LEDATE    12
     union VALUETYPE {
                unsigned char b;
                unsigned short h;