summaryrefslogtreecommitdiff
path: root/lib/gllib/string.in.h
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2011-07-14 13:10:45 +0200
committerSimon Josefsson <simon@josefsson.org>2011-07-14 13:10:45 +0200
commit22467f04196c52ebfdf14255748de1b977bff865 (patch)
treedcc3bbeadbe38e3c930a9dcf3246d62f10171b86 /lib/gllib/string.in.h
parentc5f7aa11f5fb3095320cfd39903d933e9c27a67b (diff)
downloadlibtasn1-22467f04196c52ebfdf14255748de1b977bff865.tar.gz
libtasn1-22467f04196c52ebfdf14255748de1b977bff865.tar.bz2
libtasn1-22467f04196c52ebfdf14255748de1b977bff865.zip
Update gnulib files.
Diffstat (limited to 'lib/gllib/string.in.h')
-rw-r--r--lib/gllib/string.in.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/gllib/string.in.h b/lib/gllib/string.in.h
index 7f3f0b4..5a66634 100644
--- a/lib/gllib/string.in.h
+++ b/lib/gllib/string.in.h
@@ -16,7 +16,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifndef _GL_STRING_H
+#ifndef _@GUARD_PREFIX@_STRING_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -26,8 +26,8 @@
/* The include_next requires a split double-inclusion guard. */
#@INCLUDE_NEXT@ @NEXT_STRING_H@
-#ifndef _GL_STRING_H
-#define _GL_STRING_H
+#ifndef _@GUARD_PREFIX@_STRING_H
+#define _@GUARD_PREFIX@_STRING_H
/* NetBSD 5.0 mis-defines NULL. */
#include <stddef.h>
@@ -736,9 +736,9 @@ _GL_CXXALIASWARN (mbschr);
and return a pointer to it. Return NULL if C is not found in STRING.
Unlike strrchr(), this function works correctly in multibyte locales with
encodings such as GB18030. */
-# if defined __hpux
+# if defined __hpux || defined __INTERIX
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-# define mbsrchr rpl_mbsrchr /* avoid collision with HP-UX function */
+# define mbsrchr rpl_mbsrchr /* avoid collision with system function */
# endif
_GL_FUNCDECL_RPL (mbsrchr, char *, (const char *string, int c)
_GL_ARG_NONNULL ((1)));
@@ -977,5 +977,5 @@ _GL_WARN_ON_USE (strverscmp, "strverscmp is unportable - "
#endif
-#endif /* _GL_STRING_H */
-#endif /* _GL_STRING_H */
+#endif /* _@GUARD_PREFIX@_STRING_H */
+#endif /* _@GUARD_PREFIX@_STRING_H */