diff --git a/configure b/configure index be9e7dfafd5fcd9a8ace0033696bba29c2639065..0b58099b6516e4ea947b14048f493c1ab3982617 100755 --- a/configure +++ b/configure @@ -5896,7 +5896,6 @@ for ac_header in \ scsi/sg.h \ stdbool.h \ stdint.h \ - strings.h \ stropts.h \ sys/asoundlib.h \ sys/attr.h \ diff --git a/configure.ac b/configure.ac index d5b2a41f2861c759452b18c8212a56168a2f2d03..66a7aa6aea5ea7ecf1ec546bc04bf925c2f0d21e 100644 --- a/configure.ac +++ b/configure.ac @@ -483,7 +483,6 @@ AC_CHECK_HEADERS(\ scsi/sg.h \ stdbool.h \ stdint.h \ - strings.h \ stropts.h \ sys/asoundlib.h \ sys/attr.h \ diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 231466c25ac8fe20212c56ea3f8f267ce344bde3..376395956e778cfcebfda6f049b77f87cd0cfda9 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -27,9 +27,6 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> -#ifdef HAVE_STRINGS_H -# include <strings.h> -#endif #ifdef HAVE_TERMIOS_H #include <termios.h> #endif diff --git a/libs/port/getopt.c b/libs/port/getopt.c index e38d1370489668258a42397ed0be8ecea7d4704b..fb1e315c8c6c055b0b4571ac04e034ba35e3842b 100644 --- a/libs/port/getopt.c +++ b/libs/port/getopt.c @@ -203,22 +203,8 @@ static enum /* Value of POSIXLY_CORRECT environment variable. */ static char *posixly_correct; -#ifdef __GNU_LIBRARY__ -/* We want to avoid inclusion of string.h with non-GNU libraries - because there are many ways it can cause trouble. - On some systems, it contains special magic macros that don't work - in GCC. */ -# include <string.h> -# define my_index strchr -#else - -# ifdef HAVE_STRING_H -# include <string.h> -# else -# include <strings.h> -# endif - -# define my_index strchr +#include <string.h> +#define my_index strchr /* If using GCC, we can safely declare strlen this way. If not using GCC, it is ok not to declare it. */ @@ -232,8 +218,6 @@ extern int strlen (const char *); # endif /* not __STDC__ */ #endif /* __GNUC__ */ -#endif /* not __GNU_LIBRARY__ */ - /* Handle permutation of arguments. */ /* Describe the part of ARGV that contains non-options that have