X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrstr.h;h=a28b1401ea3aec8235b87ef75f6a8c6d8e9bfdb5;hb=4a6f6ccf4f28947ff868115b73434a9c5af32727;hp=ca9a82a965ed06acba9c48067b81b4137ba123db;hpb=103b7cd6e6cc45a5aa570ad8c4d0aa6b0188b602;p=gnulib.git

diff --git a/lib/strstr.h b/lib/strstr.h
index ca9a82a96..a28b1401e 100644
--- a/lib/strstr.h
+++ b/lib/strstr.h
@@ -15,10 +15,20 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
+
+/* 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>
+
 #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);