Fix strnlen change

1 files changed, 4 insertions, 6 deletions

diff --git a/string/strnlen.c b/string/strnlen.c
index 3f52c49..d083ec2 100644
--- a/string/strnlen.c
+++ b/string/strnlen.c
@@ -27,16 +27,16 @@
 /* Find the length of S, but scan at most MAXLEN characters.  If no
    '\0' terminator is found in that many characters, return MAXLEN.  */
 
-#ifndef STRNLEN
-# define STRNLEN __strnlen
+#ifdef STRNLEN
+# define __strnlen STRNLEN
 #endif
 
 size_t
-STRNLEN (const char *str, size_t maxlen)
+__strnlen (const char *str, size_t maxlen)
 {
   const char *char_ptr, *end_ptr = str + maxlen;
   const unsigned long int *longword_ptr;
-  unsigned long int longword, magic_bits, himagic, lomagic;
+  unsigned long int longword, himagic, lomagic;
 
   if (maxlen == 0)
     return 0;
@@ -70,14 +70,12 @@ STRNLEN (const char *str, size_t maxlen)
 
      The 1-bits make sure that carries propagate to the next 0-bit.
      The 0-bits provide holes for carries to fall into.  */
-  magic_bits = 0x7efefeffL;
   himagic = 0x80808080L;
   lomagic = 0x01010101L;
   if (sizeof (longword) > 4)
     {
       /* 64-bit version of the magic.  */
       /* Do the shift in two steps to avoid a warning if long has 32 bits.  */
-      magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL;
       himagic = ((himagic << 16) << 16) | himagic;
       lomagic = ((lomagic << 16) << 16) | lomagic;
     }