X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-dirname.c;h=eac91622f45e835e879d35916f54a69be5772912;hb=fb7fde6f658ac18b7ab7ca61dca9a290cc8c3348;hp=eace24e87e201b76e5d05640e307c905cebb265b;hpb=1e4ece4ab9850fbfa88c9ec43ea518c7bc266792;p=gnulib.git

diff --git a/tests/test-dirname.c b/tests/test-dirname.c
index eace24e87..eac91622f 100644
--- a/tests/test-dirname.c
+++ b/tests/test-dirname.c
@@ -15,9 +15,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "dirname.h"
 
@@ -154,8 +152,9 @@ main ()
 		 || (dirlen + 1 == strlen (dir) && dir[dirlen] == '.'))))
 	{
 	  ok = false;
-	  printf ("dir_name `%s': got `%s' len %d, expected `%s' len %d\n",
-		  t->name, dir, dirlen, t->dir, strlen (t->dir));
+	  printf ("dir_name `%s': got `%s' len %d, expected `%s' len %ld\n",
+		  t->name, dir, dirlen,
+		  t->dir, (unsigned long) strlen (t->dir));
 	}
       if (strcmp (last, t->last))
 	{
@@ -169,8 +168,9 @@ main ()
 		     && ISSLASH (base[baselen])))))
 	{
 	  ok = false;
-	  printf ("base_name `%s': got `%s' len %d, expected `%s' len %d\n",
-		  t->name, base, baselen, t->base, strlen (t->base));
+	  printf ("base_name `%s': got `%s' len %d, expected `%s' len %ld\n",
+		  t->name, base, baselen,
+		  t->base, (unsigned long) strlen (t->base));
 	}
       if (strcmp (stripped, t->stripped) || modified != t->modified)
 	{