diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-04-07 15:21:48 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-04-07 15:21:48 +0200 |
| commit | 309edb070d7644550f96bce2d89b0ac145b3940e (patch) | |
| tree | c158313029ab8147568638a8b98ea101a561f326 | |
| parent | 06fc66ed7c86b09120bfc2696ab0a6a9954829a9 (diff) | |
| parent | fd1ad1e25a6d0676a560d237ff5f44faa6e1dc87 (diff) | |
| download | php-git-309edb070d7644550f96bce2d89b0ac145b3940e.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove HAVE_LIMITS_H
| -rw-r--r-- | TSRM/tsrm_config_common.h | 2 | ||||
| -rw-r--r-- | Zend/Zend.m4 | 1 | ||||
| -rw-r--r-- | Zend/zend_alloc.c | 2 | ||||
| -rw-r--r-- | Zend/zend_portability.h | 4 | ||||
| -rw-r--r-- | ext/standard/exec.c | 2 | ||||
| -rw-r--r-- | ext/standard/string.c | 6 | ||||
| -rw-r--r-- | ext/standard/url_scanner_ex.re | 4 | ||||
| -rw-r--r-- | main/php.h | 2 |
8 files changed, 2 insertions, 21 deletions
diff --git a/TSRM/tsrm_config_common.h b/TSRM/tsrm_config_common.h index 64cecd912a..d3c7672d48 100644 --- a/TSRM/tsrm_config_common.h +++ b/TSRM/tsrm_config_common.h @@ -35,9 +35,7 @@ char *alloca (); #include <unistd.h> #endif -#if HAVE_LIMITS_H #include <limits.h> -#endif #ifndef MAXPATHLEN # if _WIN32 diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index c1f809d2b2..cad7e95df6 100644 --- a/Zend/Zend.m4 +++ b/Zend/Zend.m4 @@ -8,7 +8,6 @@ AC_REQUIRE([AC_PROG_CC]) AC_CHECK_HEADERS( inttypes.h \ stdint.h \ -limits.h \ malloc.h \ unistd.h \ sys/types.h \ diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index dabf48150c..77474c5527 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -77,9 +77,7 @@ #include <sys/types.h> #include <sys/stat.h> -#if HAVE_LIMITS_H #include <limits.h> -#endif #include <fcntl.h> #include <errno.h> diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h index fe3f5c4245..56b7a1ada3 100644 --- a/Zend/zend_portability.h +++ b/Zend/zend_portability.h @@ -60,9 +60,7 @@ # include <dlfcn.h> #endif -#ifdef HAVE_LIMITS_H -# include <limits.h> -#endif +#include <limits.h> #if HAVE_ALLOCA_H && !defined(_ALLOCA_H) # include <alloca.h> diff --git a/ext/standard/exec.c b/ext/standard/exec.c index 63e1d97e1d..3839945836 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -49,9 +49,7 @@ #include <unistd.h> #endif -#if HAVE_LIMITS_H #include <limits.h> -#endif #ifdef PHP_WIN32 # include "win32/nice.h" diff --git a/ext/standard/string.c b/ext/standard/string.c index 1f18bb23d8..60b19542ec 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -90,12 +90,6 @@ void register_string_constants(INIT_FUNC_ARGS) #ifdef HAVE_LOCALECONV /* If last members of struct lconv equal CHAR_MAX, no grouping is done */ - -/* This is bad, but since we are going to be hardcoding in the POSIX stuff anyway... */ -# ifndef HAVE_LIMITS_H -# define CHAR_MAX 127 -# endif - REGISTER_LONG_CONSTANT("CHAR_MAX", CHAR_MAX, CONST_CS | CONST_PERSISTENT); #endif diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re index 0386d0e955..8ad129380e 100644 --- a/ext/standard/url_scanner_ex.re +++ b/ext/standard/url_scanner_ex.re @@ -22,10 +22,8 @@ #ifdef HAVE_UNISTD_H #include <unistd.h> #endif -#ifdef HAVE_LIMITS_H -#include <limits.h> -#endif +#include <limits.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/main/php.h b/main/php.h index 2d5ed07eb1..270fdf57ce 100644 --- a/main/php.h +++ b/main/php.h @@ -243,9 +243,7 @@ char *strerror(int); # endif #endif -#if HAVE_LIMITS_H #include <limits.h> -#endif #ifndef LONG_MAX #define LONG_MAX 2147483647L |