diff options
| author | Xinchen Hui <laruence@php.net> | 2012-04-22 19:59:46 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-04-22 19:59:46 +0800 |
| commit | 0d115ca2116f7d3cee7f5d1b27622d9acf440284 (patch) | |
| tree | 5603d1a020481ed601dbd1beae7136d02e92af82 | |
| parent | 3ca1976b3cb3d96bf6514e407e9e02447809dcca (diff) | |
| parent | f13b0ede0764f63762f105fb6c62de460f7b7490 (diff) | |
| download | php-git-0d115ca2116f7d3cee7f5d1b27622d9acf440284.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed warning implicit declaration of function 'file_printedlen'
| -rw-r--r-- | ext/fileinfo/libmagic.patch | 14 | ||||
| -rw-r--r-- | ext/fileinfo/libmagic/file.h | 1 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ext/fileinfo/libmagic.patch b/ext/fileinfo/libmagic.patch index 73e482669d..baeac1dc16 100644 --- a/ext/fileinfo/libmagic.patch +++ b/ext/fileinfo/libmagic.patch @@ -1080,7 +1080,7 @@ diff -u libmagic.orig/compress.c libmagic/compress.c +#endif /* if PHP_FILEINFO_UNCOMPRESS */ diff -u libmagic.orig/file.h libmagic/file.h --- libmagic.orig/file.h 2012-04-22 19:30:43.186305188 +0800 -+++ libmagic/file.h 2012-04-22 19:28:57.378309534 +0800 ++++ libmagic/file.h 2012-04-22 19:49:58.922256776 +0800 @@ -33,11 +33,9 @@ #ifndef __file_h__ #define __file_h__ @@ -1200,7 +1200,13 @@ diff -u libmagic.orig/file.h libmagic/file.h protected void file_showstr(FILE *, const char *, size_t); protected size_t file_mbswidth(const char *); protected const char *file_getbuffer(struct magic_set *); -@@ -443,11 +439,8 @@ +@@ -438,16 +434,14 @@ + size_t *); + protected size_t file_pstring_length_size(const struct magic *); + protected size_t file_pstring_get_length(const struct magic *, const char *); ++protected size_t file_printedlen(const struct magic_set *ms); + #ifdef __EMX__ + protected int file_os2_apptype(struct magic_set *, const char *, const void *, size_t); #endif /* __EMX__ */ @@ -1212,7 +1218,7 @@ diff -u libmagic.orig/file.h libmagic/file.h #ifndef HAVE_STRERROR extern int sys_nerr; -@@ -460,17 +453,10 @@ +@@ -460,17 +454,10 @@ #define strtoul(a, b, c) strtol(a, b, c) #endif @@ -1232,7 +1238,7 @@ diff -u libmagic.orig/file.h libmagic/file.h size_t strlcat(char *dst, const char *src, size_t siz); #endif #ifndef HAVE_GETLINE -@@ -500,4 +486,12 @@ +@@ -500,4 +487,12 @@ #define FILE_RCSID(id) #endif diff --git a/ext/fileinfo/libmagic/file.h b/ext/fileinfo/libmagic/file.h index e1269aee0e..3879b47564 100644 --- a/ext/fileinfo/libmagic/file.h +++ b/ext/fileinfo/libmagic/file.h @@ -434,6 +434,7 @@ protected int file_looks_utf8(const unsigned char *, size_t, unichar *, size_t *); protected size_t file_pstring_length_size(const struct magic *); protected size_t file_pstring_get_length(const struct magic *, const char *); +protected size_t file_printedlen(const struct magic_set *ms); #ifdef __EMX__ protected int file_os2_apptype(struct magic_set *, const char *, const void *, size_t); |