summaryrefslogtreecommitdiff
path: root/ext/standard
diff options
context:
space:
mode:
authorGeorge Peter Banyard <girgias@php.net>2020-04-22 20:18:19 +0200
committerGeorge Peter Banyard <girgias@php.net>2020-04-22 20:18:19 +0200
commitf91f72607b8101bfe9df3bf8327c99e9a1f21a00 (patch)
treecdbd86578a6709fa3c901747532d7cd8d3dcf890 /ext/standard
parent657f756ccd79b0fd1268eb9796e371aa3f76c2a8 (diff)
downloadphp-git-f91f72607b8101bfe9df3bf8327c99e9a1f21a00.tar.gz
Drop unnecessary stdint and inttypes header checks
These are always available as of C99. Closes GH-5323 Co-authored-by: "Christoph M. Becker" <cmbecker69@gmx.de>
Diffstat (limited to 'ext/standard')
-rw-r--r--ext/standard/image.c3
-rw-r--r--ext/standard/iptc.c11
2 files changed, 3 insertions, 11 deletions
diff --git a/ext/standard/image.c b/ext/standard/image.c
index e7bc509e91..e967aaeee0 100644
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -26,9 +26,6 @@
#include <unistd.h>
#endif
#include "php_image.h"
-#ifdef PHP_WIN32
-#include "win32/php_stdint.h"
-#endif
#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
#include "zlib.h"
diff --git a/ext/standard/iptc.c b/ext/standard/iptc.c
index 8b327c1929..ea86795555 100644
--- a/ext/standard/iptc.c
+++ b/ext/standard/iptc.c
@@ -33,14 +33,9 @@
#include <sys/stat.h>
-#ifdef PHP_WIN32
-# include "win32/php_stdint.h"
-#else
-# if HAVE_INTTYPES_H
-# include <inttypes.h>
-# elif HAVE_STDINT_H
-# include <stdint.h>
-# endif
+#include <stdint.h>
+#ifndef PHP_WIN32
+# include <inttypes.h>
#endif
/* some defines for the different JPEG block types */