diff options
| author | Jim Meyering <jim@meyering.net> | 2003-08-18 09:44:49 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2003-08-18 09:44:49 +0000 |
| commit | b1b4af8047b2d6c2b2ea0d552969e25f872da675 (patch) | |
| tree | ee8166cbc3f75e901def92c7c94473473d360165 /lib/strnlen.c | |
| parent | 84a9ab5a07427ab8322424cd0c401e847326e7e2 (diff) | |
| download | coreutils-b1b4af8047b2d6c2b2ea0d552969e25f872da675.tar.xz | |
Sync with gnulib.
Diffstat (limited to 'lib/strnlen.c')
| -rw-r--r-- | lib/strnlen.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/strnlen.c b/lib/strnlen.c index f4a5b454f..617b0aa18 100644 --- a/lib/strnlen.c +++ b/lib/strnlen.c @@ -1,5 +1,5 @@ /* Find the length of STRING, but scan at most MAXLEN characters. - Copyright (C) 1996, 1997, 1998, 2000-2002 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 2000-2003 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify @@ -19,16 +19,13 @@ #if HAVE_CONFIG_H # include <config.h> #endif +#undef strnlen #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> -# undef strnlen #else # include <strings.h> #endif @@ -43,6 +40,10 @@ char *memchr (); #undef __strnlen #undef strnlen +#ifndef _LIBC +# define strnlen rpl_strnlen +#endif + #ifndef weak_alias # define __strnlen strnlen #endif |