From 7f787f3fc96d7f6e365d09e6d2a4f71ecca540b4 Mon Sep 17 00:00:00 2001
From: Micah Cowan <micah@cowan.name>
Date: Tue, 11 Nov 2008 20:54:30 -0800
Subject: [PATCH] Just use string.h, strings.h if they're available.

---
 src/configure.in |  2 +-
 src/os.h         | 26 ++++++--------------------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/configure.in b/src/configure.in
index d2171c2..9cd5d3a 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -208,7 +208,7 @@ AC_TRY_LINK([#include <utmpx.h>
 [AC_CHECK_HEADER(dwarf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN),
 [AC_CHECK_HEADER(elf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN))])]
 ,LIBS="$oldlibs")
-AC_CHECK_HEADERS([stropts.h])
+AC_CHECK_HEADERS([stropts.h string.h strings.h])
 
 AC_CHECKING(for Solaris 2.x)
 AC_EGREP_CPP(yes,
diff --git a/src/os.h b/src/os.h
index a05a180..5bf417d 100644
--- a/src/os.h
+++ b/src/os.h
@@ -75,26 +75,12 @@ extern int errno;
 #undef strerror
 #endif
 
-#if !defined(SYSV) && !defined(linux)
-# ifdef NEWSOS
-#  define strlen ___strlen___
-#  include <strings.h>
-#  undef strlen
-# else /* NEWSOS */
-#  include <strings.h>
-# endif /* NEWSOS */
-#else /* SYSV */
-# if defined(SVR4) || defined(NEWSOS)
-#  define strlen ___strlen___
-#  include <string.h>
-#  undef strlen
-#  if !defined(NEWSOS) && !defined(__hpux)
-    extern size_t strlen(const char *);
-#  endif
-# else /* SVR4 */
-#  include <string.h>
-# endif /* SVR4 */
-#endif /* SYSV */
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
 
 #ifdef USEVARARGS
 # if defined(__STDC__)
-- 
2.11.4.GIT