X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fquotearg.c;h=1d1b543957d5848bfe3d32955cb1a215c75ef7f2;hb=fb84631f1ec8e82d252cbad0b5b7f83a98e74ba9;hp=eef237f0e60ced3a30ee1748c89f3629463a9406;hpb=922fa4cc3d1d3173c663784079312a67fc599041;p=gnulib.git

diff --git a/lib/quotearg.c b/lib/quotearg.c
index eef237f0e..1d1b54395 100644
--- a/lib/quotearg.c
+++ b/lib/quotearg.c
@@ -19,7 +19,7 @@
 
 /* Written by Paul Eggert <eggert@twinsun.com> */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
@@ -586,7 +586,12 @@ quotearg_n_options (int n, char const *arg, size_t argsize,
 
   if (nslots <= n0)
     {
-      unsigned int n1 = n0 + 1;
+      /* FIXME: technically, the type of n1 should be `unsigned int',
+	 but that evokes an unsuppressible warning from gcc-4.0.1 and
+	 older.  If gcc ever provides an option to suppress that warning,
+	 revert to the original type, so that the test in xalloc_oversized
+	 is once again performed only at compile time.  */
+      size_t n1 = n0 + 1;
 
       if (xalloc_oversized (n1, sizeof *slotvec))
 	xalloc_die ();