From: Jim Meyering <jim@meyering.net>
Date: Tue, 21 Mar 1995 01:43:35 +0000 (+0000)
Subject: merge with 1.11.d
X-Git-Tag: cvs-readonly~8764
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=ff9e18a3c9c9b659fee0f2c65269a38a2d133bde;hp=cb0e9ba1b4f96efd5ca7649047d6aeb8edf01e6f;p=gnulib.git

merge with 1.11.d
---

diff --git a/lib/memchr.c b/lib/memchr.c
index 71b1ab5f6..57f99735f 100644
--- a/lib/memchr.c
+++ b/lib/memchr.c
@@ -100,7 +100,7 @@ memchr (s, c, n)
   charmask = c | (c << 8);
   charmask |= charmask << 16;
 #if LONG_MAX > LONG_MAX_32_BITS
-    charmask |= charmask << 32;
+  charmask |= charmask << 32;
 #endif
 
   /* Instead of the traditional loop which tests each character,
diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index bebeca3b6..fd0c97f63 100644
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -49,6 +49,7 @@ strtol_error
 	  break;							\
 									\
 	case LONGINT_OVERFLOW:						\
+	  /* FIXME: make this message dependent on STRING_TO_UNSIGNED */\
 	  error ((exit_code), 0, "%s `%s' larger than maximum long int",\
 		 (argument_type_string), (str));			\
 	  break;							\