X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmemchr.c;h=2253d2d651cd2b97993309f2cb00428041082c21;hb=8b8527c54ce6fc1331805d44bd2c556b58976844;hp=2398dc3dffba660a845bc5f96d90c2f426e49a56;hpb=ca8e12bc871dc3ee65cec526ec2628abdd01ee8c;p=gnulib.git

diff --git a/lib/memchr.c b/lib/memchr.c
index 2398dc3df..2253d2d65 100644
--- a/lib/memchr.c
+++ b/lib/memchr.c
@@ -45,8 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 # define BP_SYM(sym) sym
 #endif
 
-#include "intprops.h"
-
 #undef __memchr
 #ifdef _LIBC
 # undef memchr
@@ -65,7 +63,7 @@ __memchr (void const *s, int c_in, size_t n)
      performance.  On 64-bit hardware, unsigned long is generally 64
      bits already.  Change this typedef to experiment with
      performance.  */
-  typedef unsigned long longword;
+  typedef unsigned long int longword;
 
   const unsigned char *char_ptr;
   const longword *longword_ptr;
@@ -94,7 +92,7 @@ __memchr (void const *s, int c_in, size_t n)
   repeated_one = 0x01010101;
   repeated_c = c | (c << 8);
   repeated_c |= repeated_c << 16;
-  if (0xffffffffU < TYPE_MAXIMUM (longword))
+  if (0xffffffffU < (longword) -1)
     {
       repeated_one |= repeated_one << 31 << 1;
       repeated_c |= repeated_c << 31 << 1;