From af59e6f1b7f88952e983434b383e3b8a7acb4384 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Wed, 9 Jan 2013 12:25:14 +0100
Subject: [PATCH] configure: Get rid of the check for strings.h.

---
 configure           |  1 -
 configure.ac        |  1 -
 dlls/ntdll/serial.c |  3 ---
 libs/port/getopt.c  | 20 ++------------------
 4 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/configure b/configure
index be9e7dfafd5..0b58099b651 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 d5b2a41f286..66a7aa6aea5 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 231466c25ac..376395956e7 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 e38d1370489..fb1e315c8c6 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