From e523bd15353350c3480b8a1820a0944b0fa8212e Mon Sep 17 00:00:00 2001
From: "\"Steven J. Hill\"" <sjhill@realitydiluted.com>
Date: Sat, 7 Jan 2006 02:32:27 +0000
Subject: Big fricking merge from trunk.

---
 libc/string/generic/strnlen.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'libc/string/generic/strnlen.c')

diff --git a/libc/string/generic/strnlen.c b/libc/string/generic/strnlen.c
index ff5c13739..4b96dde31 100644
--- a/libc/string/generic/strnlen.c
+++ b/libc/string/generic/strnlen.c
@@ -24,8 +24,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#undef strnlen
-
 /* Find the length of S, but scan at most MAXLEN characters.  If no
    '\0' terminator is found in that many characters, return MAXLEN.  */
 size_t attribute_hidden __strnlen (const char *str, size_t maxlen)
@@ -159,4 +157,4 @@ size_t attribute_hidden __strnlen (const char *str, size_t maxlen)
   return char_ptr - str;
 }
 
-strong_alias(__strnlen, strnlen)
+strong_alias(__strnlen,strnlen)
-- 
cgit v1.2.3