summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-05-04 21:27:37 +0200
committerAnatol Belski <ab@php.net>2014-05-04 21:27:37 +0200
commitfe7853137b249d1fc189a38fa372b19150268386 (patch)
tree29fafd666c304ae25a0fe6a067ac4017b1ec4c2d
parentf66449a46707a012ba0d6a6cfe4f434487112bd8 (diff)
parent031cafd4e2670992f5e45d281ab3a5eb666748c5 (diff)
downloadphp-git-fe7853137b249d1fc189a38fa372b19150268386.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: added missing stdint header, bug #66907
-rw-r--r--ext/fileinfo/libmagic/strcasestr.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/fileinfo/libmagic/strcasestr.c b/ext/fileinfo/libmagic/strcasestr.c
index 546ed3f96c..e1434e69e7 100644
--- a/ext/fileinfo/libmagic/strcasestr.c
+++ b/ext/fileinfo/libmagic/strcasestr.c
@@ -37,6 +37,8 @@ __RCSID("$NetBSD: strcasestr.c,v 1.3 2005/11/29 03:12:00 christos Exp $");
__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>