projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure we use gnulib mktime rather than glibc's mktime, on hosts
[gnulib.git]
/
lib
/
strnlen.c
diff --git
a/lib/strnlen.c
b/lib/strnlen.c
index
b6c7102
..
e7ad6d2
100644
(file)
--- a/
lib/strnlen.c
+++ b/
lib/strnlen.c
@@
-1,5
+1,5
@@
/* Find the length of STRING, but scan at most MAXLEN characters.
/* Find the length of STRING, but scan at most MAXLEN characters.
- Copyright (C) 1996, 1997, 1998, 2000-200
2
Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 2000-200
3
Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@
-20,16
+20,13
@@
#if HAVE_CONFIG_H
# include <config.h>
#endif
#if HAVE_CONFIG_H
# include <config.h>
#endif
+#undef strnlen
#if HAVE_STRING_H
# if !STDC_HEADERS && HAVE_MEMORY_H
# include <memory.h>
# endif
#if HAVE_STRING_H
# if !STDC_HEADERS && HAVE_MEMORY_H
# include <memory.h>
# endif
-/* Temporarily redefine strnlen so that an inconsistent prototype
- (on at least AIX4.3.2.0 w/gcc-2.95.3) doesn't cause trouble. */
-# define strnlen system_strnlen
# include <string.h>
# include <string.h>
-# undef strnlen
#else
# include <strings.h>
#endif
#else
# include <strings.h>
#endif
@@
-44,6
+41,10
@@
char *memchr ();
#undef __strnlen
#undef strnlen
#undef __strnlen
#undef strnlen
+#ifndef _LIBC
+# define strnlen rpl_strnlen
+#endif
+
#ifndef weak_alias
# define __strnlen strnlen
#endif
#ifndef weak_alias
# define __strnlen strnlen
#endif