iliaa Tue Aug 19 18:13:02 2003 EDT
Modified files:
/php-src/ext/mime_magic mime_magic.c php_mime_magic.h
Log:
Fixed bug #25155 (Possible namespace conflict between mime-magic & mssql)
Index: php-src/ext/mime_magic/mime_magic.c
diff -u php-src/ext/mime_magic/mime_magic.c:1.30
php-src/ext/mime_magic/mime_magic.c:1.31
--- php-src/ext/mime_magic/mime_magic.c:1.30 Tue Jun 10 16:03:32 2003
+++ php-src/ext/mime_magic/mime_magic.c Tue Aug 19 18:13:01 2003
@@ -15,7 +15,7 @@
| Author: Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mime_magic.c,v 1.30 2003/06/10 20:03:32 imajes Exp $
+ $Id: mime_magic.c,v 1.31 2003/08/19 22:13:01 iliaa Exp $
This module contains a lot of stuff taken from Apache mod_mime_magic,
so the license section is a little bit longer than usual:
@@ -167,6 +167,18 @@
#ifdef PHP_WIN32
#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);
Index: php-src/ext/mime_magic/php_mime_magic.h
diff -u php-src/ext/mime_magic/php_mime_magic.h:1.7
php-src/ext/mime_magic/php_mime_magic.h:1.8
--- php-src/ext/mime_magic/php_mime_magic.h:1.7 Tue Jun 10 16:03:32 2003
+++ php-src/ext/mime_magic/php_mime_magic.h Tue Aug 19 18:13:01 2003
@@ -15,7 +15,7 @@
| Author: |
+----------------------------------------------------------------------+
- $Id: php_mime_magic.h,v 1.7 2003/06/10 20:03:32 imajes Exp $
+ $Id: php_mime_magic.h,v 1.8 2003/08/19 22:13:01 iliaa Exp $
*/
#ifndef PHP_MIME_MAGIC_H
@@ -58,17 +58,6 @@
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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
