From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 22 Jul 2020 14:03:06 +0000 (+0200)
Subject: Remove no longer needed stdint compatibility defines
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93594862f4530af39bcecc7bda0a2b8cdf543be5;p=php

Remove no longer needed stdint compatibility defines

Closes GH-5886.
---

diff --git a/build/php.m4 b/build/php.m4
index 9fb6811a6a..c66550114a 100644
--- a/build/php.m4
+++ b/build/php.m4
@@ -2425,7 +2425,9 @@ AC_DEFUN([PHP_CHECK_STDINT_TYPES], [
   AC_CHECK_SIZEOF([long long])
   AC_CHECK_SIZEOF([size_t])
   AC_CHECK_SIZEOF([off_t])
-  AC_CHECK_TYPES([int8, int16, int32, int64, int8_t, int16_t, int32_t, int64_t, uint8, uint16, uint32, uint64, uint8_t, uint16_t, uint32_t, uint64_t, u_int8_t, u_int16_t, u_int32_t, u_int64_t], [], [], [
+  AC_CHECK_TYPES([int8_t, int16_t, int32_t, int64_t, uint8_t, uint16_t, uint32_t, uint64_t], [], [
+    AC_MSG_ERROR([One of the intN_t or uintN_t types is not available])
+  ], [
 #include <stdint.h>
 #if HAVE_SYS_TYPES_H
 # include <sys/types.h>
diff --git a/main/php_stdint.h b/main/php_stdint.h
index 42bf9aa316..0ea91fadeb 100644
--- a/main/php_stdint.h
+++ b/main/php_stdint.h
@@ -41,157 +41,11 @@
 
 #include <inttypes.h>
 #include <stdint.h>
+
 #if defined(_MSC_VER)
 # ifndef u_char
 typedef unsigned __int8   u_char;
 # endif
-#else
-
-#include "php_config.h"
-
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifndef HAVE_INT8_T
-# ifdef HAVE_INT8
-typedef int8 int8_t;
-# else
-typedef signed char int8_t;
-# endif
-#endif
-
-#ifndef INT8_C
-# define INT8_C(c) c
-#endif
-
-#ifndef HAVE_UINT8_T
-# ifdef HAVE_UINT8
-typedef uint8 uint8_t
-# elif HAVE_U_INT8_T
-typedef u_int8_t uint8_t;
-# else
-typedef unsigned char uint8_t;
-# endif
-#endif
-
-#ifndef UINT8_C
-# define UINT8_C(c) c
-#endif
-
-#ifndef HAVE_INT16_T
-# ifdef HAVE_INT16
-typedef int16 int16_t;
-# elif SIZEOF_SHORT >= 2
-typedef signed short int16_t;
-# else
-#  error "No suitable 16bit integer type found"
-# endif
-#endif
-
-#ifndef INT16_C
-# define INT16_C(c) c
-#endif
-
-#ifndef HAVE_UINT16_T
-# ifdef HAVE_UINT16
-typedef uint16 uint16_t
-# elif HAVE_U_INT16_T
-typedef u_int16_t uint16_t;
-# elif SIZEOF_SHORT >= 2
-typedef unsigned short uint16_t;
-# else
-#  error "No suitable 16bit integer type found"
-# endif
-#endif
-
-#ifndef UINT16_C
-# define UINT16_C(c) c
-#endif
-
-#ifndef HAVE_INT32_T
-# ifdef HAVE_INT32
-typedef int32 int32_t;
-# elif SIZEOF_INT >= 4
-typedef int int32_t;
-# elif SIZEOF_LONG >= 4
-typedef long int32_t;
-# else
-#  error "No suitable 32bit integer type found"
-# endif
-#endif
-
-#ifndef INT32_C
-# define INT32_C(c) c
-#endif
-
-#ifndef HAVE_UINT32_T
-# ifdef HAVE_UINT32
-typedef uint32 uint32_t
-# elif HAVE_U_INT32_T
-typedef u_int32_t uint32_t;
-# elif SIZEOF_INT >= 4
-typedef unsigned int uint32_t;
-# elif SIZEOF_LONG >= 4
-typedef unsigned long uint32_t;
-# else
-#  error "No suitable 32bit integer type found"
-# endif
-#endif
-
-#ifndef UINT32_C
-# define UINT32_C(c) c ## U
-#endif
-
-#ifndef HAVE_INT64_T
-# ifdef HAVE_INT64
-typedef int64 int64_t;
-# elif SIZEOF_INT >= 8
-typedef int int64_t;
-# elif SIZEOF_LONG >= 8
-typedef long int64_t;
-# elif SIZEOF_LONG_LONG >= 8
-typedef long long int64_t;
-# else
-#  error "No suitable 64bit integer type found"
-# endif
-#endif
-
-#ifndef INT64_C
-# if SIZEOF_INT >= 8
-#  define INT64_C(c) c
-# elif SIZEOF_LONG >= 8
-#  define INT64_C(c) c ## L
-# elif SIZEOF_LONG_LONG >= 8
-#  define INT64_C(c) c ## LL
-# endif
-#endif
-
-#ifndef HAVE_UINT64_T
-# ifdef HAVE_UINT64
-typedef uint64 uint64_t
-# elif HAVE_U_INT64_T
-typedef u_int64_t uint64_t;
-# elif SIZEOF_INT >= 8
-typedef unsigned int uint64_t;
-# elif SIZEOF_LONG >= 8
-typedef unsigned long uint64_t;
-# elif SIZEOF_LONG_LONG >= 8
-typedef unsigned long long uint64_t;
-# else
-#  error "No suitable 64bit integer type found"
-# endif
-#endif
-
-#ifndef UINT64_C
-# if SIZEOF_INT >= 8
-#  define UINT64_C(c) c ## U
-# elif SIZEOF_LONG >= 8
-#  define UINT64_C(c) c ## UL
-# elif SIZEOF_LONG_LONG >= 8
-#  define UINT64_C(c) c ## ULL
-# endif
-#endif
+#endif /* !_MSC_VER */
 
-#endif /* !PHP_WIN32 */
 #endif /* PHP_STDINT_H */