diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-04-08 23:40:46 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-04-08 23:40:46 +0200 |
| commit | a36c856b0a753adcdda249f2a3efb07a3606e17d (patch) | |
| tree | 03c6e46677f1cda6378a11971acd8590bc54e2db | |
| parent | 2f03c0aa72230eb787d20d77bf9f4f367bb3e081 (diff) | |
| parent | e6a6017f78878609b2885451b6046717f478c027 (diff) | |
| download | php-git-a36c856b0a753adcdda249f2a3efb07a3606e17d.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove HAVE_STRERROR
| -rw-r--r-- | ext/standard/php_string.h | 5 | ||||
| -rw-r--r-- | ext/standard/string.c | 18 | ||||
| -rw-r--r-- | main/php.h | 4 |
3 files changed, 0 insertions, 27 deletions
diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h index 03d1ee8f8c..53209f4485 100644 --- a/ext/standard/php_string.h +++ b/ext/standard/php_string.h @@ -143,11 +143,6 @@ PHPAPI int string_natural_compare_function_ex(zval *result, zval *op1, zval *op2 PHPAPI int string_natural_compare_function(zval *result, zval *op1, zval *op2); PHPAPI int string_natural_case_compare_function(zval *result, zval *op1, zval *op2); -#ifndef HAVE_STRERROR -PHPAPI char *php_strerror(int errnum); -#define strerror php_strerror -#endif - #ifndef HAVE_MBLEN # define php_mblen(ptr, len) 1 # define php_mb_reset() diff --git a/ext/standard/string.c b/ext/standard/string.c index f369117e10..56b9f43da5 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -3572,24 +3572,6 @@ PHP_FUNCTION(stripslashes) } /* }}} */ -#ifndef HAVE_STRERROR -/* {{{ php_strerror - */ -char *php_strerror(int errnum) -{ - extern int sys_nerr; - extern char *sys_errlist[]; - - if ((unsigned int) errnum < sys_nerr) { - return(sys_errlist[errnum]); - } - - (void) snprintf(BG(str_ebuf), sizeof(php_basic_globals.str_ebuf), "Unknown error: %d", errnum); - return(BG(str_ebuf)); -} -/* }}} */ -#endif - /* {{{ php_stripcslashes */ PHPAPI void php_stripcslashes(zend_string *str) diff --git a/main/php.h b/main/php.h index 270fdf57ce..99c1e4ae0e 100644 --- a/main/php.h +++ b/main/php.h @@ -230,10 +230,6 @@ typedef unsigned int socklen_t; #include "zend_stack.h" #include <string.h> -#ifndef HAVE_STRERROR -char *strerror(int); -#endif - #if HAVE_PWD_H # ifdef PHP_WIN32 #include "win32/param.h" |