diff options
author | George Peter Banyard <girgias@php.net> | 2020-04-22 20:18:19 +0200 |
---|---|---|
committer | George Peter Banyard <girgias@php.net> | 2020-04-22 20:18:19 +0200 |
commit | f91f72607b8101bfe9df3bf8327c99e9a1f21a00 (patch) | |
tree | cdbd86578a6709fa3c901747532d7cd8d3dcf890 /ext/fileinfo/libmagic | |
parent | 657f756ccd79b0fd1268eb9796e371aa3f76c2a8 (diff) | |
download | php-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/fileinfo/libmagic')
-rw-r--r-- | ext/fileinfo/libmagic/file.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/ext/fileinfo/libmagic/file.h b/ext/fileinfo/libmagic/file.h index 698a307deb..3450f745bd 100644 --- a/ext/fileinfo/libmagic/file.h +++ b/ext/fileinfo/libmagic/file.h @@ -52,21 +52,15 @@ #include <stdio.h> /* Include that here, to make sure __P gets defined */ #include <errno.h> #include <fcntl.h> /* For open and flags */ -#ifdef HAVE_STDINT_H + #ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS +# define __STDC_LIMIT_MACROS #endif #ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS +# define __STDC_FORMAT_MACROS #endif #include <stdint.h> -#endif -#ifdef HAVE_INTTYPES_H #include <inttypes.h> -#endif -#ifdef PHP_WIN32 -#include "win32/php_stdint.h" -#endif #include "php.h" #include "ext/standard/php_string.h" |