From: Peter Kokot <peterkokot@gmail.com>
Date: Mon, 8 Apr 2019 21:39:45 +0000 (+0200)
Subject: Remove HAVE_STRERROR
X-Git-Tag: php-7.4.0alpha1~577^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6a6017f78878609b2885451b6046717f478c027;p=php

Remove HAVE_STRERROR

Checking for the strerror function presence is no longer needed since it
is part of the C89 standard [1] and can be safely assumed that all
current systems have it.

Check in the configure.ac and Windows defined symbol are still left
until the file library (libmagic) will be updated.

[1]: https://port70.net/~nsz/c/c89/c89-draft.html
---

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 3b8f306be4..c78ec5ffac 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -3732,24 +3732,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 888344324e..48b4633879 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"