summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-05-04 21:34:36 +0200
committerAnatol Belski <ab@php.net>2014-05-04 21:34:36 +0200
commit53b4d2feea960afadd17e661df7d712b51017798 (patch)
tree6c8bccbf27111ada0f6bcae2f1c2e124ed023b58
parentfe7853137b249d1fc189a38fa372b19150268386 (diff)
parent06ae920165bcedfa2f229ca1da82e51aa1b44e2f (diff)
downloadphp-git-53b4d2feea960afadd17e661df7d712b51017798.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: updated libmagic.patch
-rw-r--r--ext/fileinfo/libmagic.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/ext/fileinfo/libmagic.patch b/ext/fileinfo/libmagic.patch
index fa708b6c83..662537bf7f 100644
--- a/ext/fileinfo/libmagic.patch
+++ b/ext/fileinfo/libmagic.patch
@@ -3286,4 +3286,16 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
break;
}
case FILE_INDIRECT:
+diff -u libmagic.orig/strcasestr.c libmagic/strcasestr.c
+--- libmagic.orig/strcasestr.c Thu Dec 5 17:57:50 2013
++++ libmagic/strcasestr.c Sun May 4 21:29:20 2014
+@@ -37,6 +37,8 @@
+ __RCSID("$NetBSD: strncasecmp.c,v 1.2 2007/06/04 18:19:27 christos Exp $");
+ #endif /* LIBC_SCCS and not lint */
+
++#include "php_stdint.h"
++
+ #include <assert.h>
+ #include <ctype.h>
+ #include <string.h>