From 47c440a8a9abdc91ce92d647a0ea0fb22e08c3d0 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Tue, 12 Mar 2019 19:46:17 +0100 Subject: [PATCH] libport: Remove checks for strerror(). Signed-off-by: Alexandre Julliard --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- include/wine/port.h | 5 ----- libs/port/Makefile.in | 1 - libs/port/strerror.c | 30 ------------------------------ 6 files changed, 41 deletions(-) delete mode 100644 libs/port/strerror.c diff --git a/configure b/configure index 273d70a31e9..1818eac8c09 100755 --- a/configure +++ b/configure @@ -16772,7 +16772,6 @@ for ac_func in \ statvfs \ strcasecmp \ strdup \ - strerror \ strncasecmp \ strnlen \ strtold \ diff --git a/configure.ac b/configure.ac index f3e8d656543..7aa4fb8ab1e 100644 --- a/configure.ac +++ b/configure.ac @@ -2190,7 +2190,6 @@ AC_CHECK_FUNCS(\ statvfs \ strcasecmp \ strdup \ - strerror \ strncasecmp \ strnlen \ strtold \ diff --git a/include/config.h.in b/include/config.h.in index 476a3fbded4..5efa27e20e3 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -936,9 +936,6 @@ /* Define to 1 if you have the `strdup' function. */ #undef HAVE_STRDUP -/* Define to 1 if you have the `strerror' function. */ -#undef HAVE_STRERROR - /* Define to 1 if you have the header file. */ #undef HAVE_STRINGS_H diff --git a/include/wine/port.h b/include/wine/port.h index e3bfa7f684e..e32818e5455 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -344,10 +344,6 @@ int strncasecmp(const char *str1, const char *str2, size_t n); size_t strnlen( const char *str, size_t maxlen ); #endif /* !defined(HAVE_STRNLEN) */ -#ifndef HAVE_STRERROR -const char *strerror(int err); -#endif /* !defined(HAVE_STRERROR) */ - #ifndef HAVE_STRCASECMP # ifndef HAVE__STRICMP int strcasecmp(const char *str1, const char *str2); @@ -524,7 +520,6 @@ extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compa #define spawnvp __WINE_NOT_PORTABLE(spawnvp) #define statvfs __WINE_NOT_PORTABLE(statvfs) #define strcasecmp __WINE_NOT_PORTABLE(strcasecmp) -#define strerror __WINE_NOT_PORTABLE(strerror) #define strncasecmp __WINE_NOT_PORTABLE(strncasecmp) #define strnlen __WINE_NOT_PORTABLE(strnlen) #define usleep __WINE_NOT_PORTABLE(usleep) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 908b6b62e13..46f98cd866f 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -99,7 +99,6 @@ C_SRCS = \ spawn.c \ statvfs.c \ strcasecmp.c \ - strerror.c \ strncasecmp.c \ strnlen.c \ symlink.c \ diff --git a/libs/port/strerror.c b/libs/port/strerror.c deleted file mode 100644 index 792d41a9e4b..00000000000 --- a/libs/port/strerror.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * strerror function - * - * Copyright 1996 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#ifndef HAVE_STRERROR -const char *strerror( int err ) -{ - /* Let's hope we have sys_errlist then */ - return sys_errlist[err]; -} -#endif /* HAVE_STRERROR */