merge with 1.11.d

diff --git a/lib/memchr.c b/lib/memchr.c
index 71b1ab5f6ecd9e26c08727a42f69c35939d6e3c6..57f99735f337ae9c412d77b6d838c1ba3b934dd2 100644 (file)
--- 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 bebeca3b6f3b4dac83bf1d6692eff84f87c9ca78..fd0c97f6325819ffb92d53a634eff87de80e506b 100644 (file)
--- 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;                                                        \