From 2748972397ec7adfd98b2360e54e9558bbafc0d9 Mon Sep 17 00:00:00 2001
From: Peter Johnson <peter@tortall.net>
Date: Sat, 12 Jul 2003 19:44:30 +0000
Subject: [PATCH] Avoid warnings in strsep due to glibc's bits/string2.h string
 inlining by defining __NO_STRING_INLINES in strsep.c.  Due to string.h
 inclusion in util.h, extra level of indirection is needed
 (NO_STRING_INLINES->__NO_STRING_INLINES).

svn path=/trunk/yasm/; revision=1004
---
 libyasm/strsep.c |  1 +
 util.h           | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/libyasm/strsep.c b/libyasm/strsep.c
index f0dbc11f..9ff9899f 100644
--- a/libyasm/strsep.c
+++ b/libyasm/strsep.c
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 #define YASM_LIB_INTERNAL
+#define NO_STRING_INLINES
 #include "util.h"
 /*@unused@*/ RCSID("$IdPath$");
 
diff --git a/util.h b/util.h
index b1ac6770..f7c0968f 100644
--- a/util.h
+++ b/util.h
@@ -34,9 +34,18 @@
 #include <config.h>
 #endif
 
+#ifdef HAVE_GNU_C_LIBRARY
+
 /* Work around glibc's non-defining of certain things when using gcc -ansi */
-#if defined(HAVE_GNU_C_LIBRARY) && defined(__STRICT_ANSI__)
-# undef __STRICT_ANSI__
+# ifdef __STRICT_ANSI__
+#  undef __STRICT_ANSI__
+# endif
+
+/* Work around glibc's string inlines (in bits/string2.h) if needed */
+# ifdef NO_STRING_INLINES
+#  define __NO_STRING_INLINES
+# endif
+
 #endif
 
 #if !defined(lint) && !defined(NDEBUG)