Add bool header to TSRM and replace php_stdint.h header with standard headers

Author: Girgias

TSRM/TSRM.h

@@ -20,7 +20,9 @@
 # include "main/php_config.h"
 #endif
 
-#include "main/php_stdint.h"
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdbool.h>
 
 #ifdef TSRM_WIN32
 #	ifdef TSRM_EXPORTS

Zend/zend_long.h

@@ -19,7 +19,8 @@
 #ifndef ZEND_LONG_H
 #define ZEND_LONG_H
 
-#include "main/php_stdint.h"
+#include <inttypes.h>
+#include <stdint.h>
 
 /* This is the heart of the whole int64 enablement in zval. */
 #if defined(__x86_64__) || defined(__LP64__) || defined(_LP64) || defined(_WIN64)

ext/date/config.w32

@@ -8,7 +8,8 @@ ADD_FLAG('CFLAGS_DATE', "/wd4244");
 
 var tl_config = FSO.CreateTextFile("ext/date/lib/timelib_config.h", true);
 tl_config.WriteLine("#include \"config.w32.h\"");
-tl_config.WriteLine("#include <php_stdint.h>");
+tl_config.WriteLine("#include <inttypes.h>");
+tl_config.WriteLine("#include <stdint.h>");
 tl_config.WriteLine("#include \"zend.h\"");
 tl_config.WriteLine("#define timelib_malloc  emalloc");
 tl_config.WriteLine("#define timelib_realloc erealloc");

ext/date/config0.m4

@@ -23,7 +23,8 @@ cat > $ext_builddir/lib/timelib_config.h <<EOF
 #else
 # include <php_config.h>
 #endif
-#include <php_stdint.h>
+#include <inttypes.h>
+#include <stdint.h>
 
 #include "zend.h"
 

ext/fileinfo/libmagic.patch

@@ -3478,7 +3478,8 @@ diff -ur libmagic.orig/strcasestr.c libmagic/strcasestr.c
 
  #include "file.h"
 
-+#include "php_stdint.h"
++#include <inttypes.h>
++#include <stdint.h>
 +
  #include <assert.h>
  #include <ctype.h>

ext/fileinfo/libmagic/strcasestr.c

@@ -39,8 +39,8 @@ __RCSID("$NetBSD: strncasecmp.c,v 1.2 2007/06/04 18:19:27 christos Exp $");
 
 #include "file.h"
 
-#include "php_stdint.h"
-
+#include <inttypes.h>
+#include <stdint.h>
 #include <assert.h>
 #include <ctype.h>
 #include <string.h>

ext/mysqlnd/mysqlnd_portability.h

@@ -38,7 +38,8 @@ This file is public domain and comes with NO WARRANTY of any kind */
   #define atoll atol
 #endif
 
-#include "php_stdint.h"
+#include <inttypes.h>
+#include <stdint.h>
 
 #if SIZEOF_LONG_LONG > 4 && !defined(_LONG_LONG)
 #define _LONG_LONG 1        /* For AIX string library */

ext/session/mod_mm.c

@@ -24,8 +24,9 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
+#include <inttypes.h>
+#include <stdint.h>
 
-#include "php_stdint.h"
 #include "php_session.h"
 #include "mod_mm.h"
 #include "SAPI.h"

ext/standard/crypt_freesec.h

@@ -7,7 +7,8 @@
 # endif
 #endif
 
-#include "php_stdint.h"
+#include <inttypes.h>
+#include <stdint.h>
 
 #define MD5_HASH_MAX_LEN 120
 

main/php.h

@@ -210,8 +210,8 @@ typedef unsigned int socklen_t;
 #endif
 
 #include <stdarg.h>
-
-#include "php_stdint.h"
+#include <inttypes.h>
+#include <stdint.h>
 
 #include "zend_hash.h"
 #include "zend_alloc.h"

main/php_stdint.h

@@ -34,7 +34,8 @@ extern "C" {
 # include "php_config.h"
 #endif
 
-#include "php_stdint.h"
+#include <inttypes.h>
+#include <stdint.h>
 
 /* Compile with -DPHP_HTTP_PARSER_STRICT=0 to make less checks, but run
  * faster

sapi/cli/php_http_parser.h

@@ -31,7 +31,8 @@
 #	include <stdint.h>
 #	include <stddef.h>
 #else
-#	include "main/php_stdint.h"
+#	include <stdint.h>
+#	include <inttypes.h>
 #endif
 #include "php.h"
 #include "php_globals.h"