Various fixes.

[pspp] / lib / strstr.h

diff --git a/lib/strstr.h b/lib/strstr.h
index 76b90b07cb47449aaa5f38a2792572f5eee25f67..a28b1401ea3aec8235b87ef75f6a8c6d8e9bfdb5 100644 (file)
--- a/lib/strstr.h
+++ b/lib/strstr.h
@@ -1,5 +1,5 @@
 /* Searching in a string.
-   Copyright (C) 2001-2003 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,22 +15,23 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_STRSTR
 
-/* Get strstr() declaration.  */
+/* Include string.h: on glibc systems, it contains a macro definition of
+   strstr() that would collide with our definition if included afterwards.  */
 #include <string.h>
 
-#else
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+/* No known system has a strstr() function that works correctly in
+   multibyte locales. Therefore we use our version always.  */
+#undef strstr
+#define strstr rpl_strstr
+
 /* Find the first occurrence of NEEDLE in HAYSTACK.  */
 extern char *strstr (const char *haystack, const char *needle);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif