projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only g++ supports variable-size arrays nowadays.
[gnulib.git]
/
lib
/
strstr.h
diff --git
a/lib/strstr.h
b/lib/strstr.h
index
f244b96
..
a28b140
100644
(file)
--- a/
lib/strstr.h
+++ b/
lib/strstr.h
@@
-1,5
+1,5
@@
/* Searching in a string.
/* 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
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
@@
-13,24
+13,25
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 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>
#include <string.h>
-#else
-
#ifdef __cplusplus
extern "C" {
#endif
#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
/* Find the first occurrence of NEEDLE in HAYSTACK. */
extern char *strstr (const char *haystack, const char *needle);
#ifdef __cplusplus
}
#endif
-
-#endif