diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2003-08-19 22:13:01 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2003-08-19 22:13:01 +0000 |
| commit | ef088c9d16b45047418ecda02239525c68b1f993 (patch) | |
| tree | 57edf4a1f5d8c4911d70bf1fa532dbf6cedec1da /ext/mime_magic | |
| parent | 9bb299eb42ebbe9b4ea81a80829a6b2b91393a65 (diff) | |
| download | php-git-ef088c9d16b45047418ecda02239525c68b1f993.tar.gz | |
Fixed bug #25155 (Possible namespace conflict between mime-magic & mssql)
Diffstat (limited to 'ext/mime_magic')
| -rw-r--r-- | ext/mime_magic/mime_magic.c | 12 | ||||
| -rw-r--r-- | ext/mime_magic/php_mime_magic.h | 11 |
2 files changed, 12 insertions, 11 deletions
diff --git a/ext/mime_magic/mime_magic.c b/ext/mime_magic/mime_magic.c index 14cc6cae3f..fdb2966691 100644 --- 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 b9e33b8410..09f3cf4740 100644 --- 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; |