X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-wcwidth.c;h=8856c0a18b1720fcbbaaf1a0f7033820b8c5aa34;hb=ca6143b425589c3a64bd28efd7af14463f96d576;hp=5b4affe1b4cfe4dd46cbb73b66dce0fb4746da62;hpb=2bb843dfd0f710cef829c2da4967c7dd36e3d775;p=gnulib.git

diff --git a/tests/test-wcwidth.c b/tests/test-wcwidth.c
index 5b4affe1b..8856c0a18 100644
--- a/tests/test-wcwidth.c
+++ b/tests/test-wcwidth.c
@@ -1,5 +1,5 @@
 /* Test of wcwidth() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,23 +20,14 @@
 
 #include <wchar.h>
 
+#include "signature.h"
+SIGNATURE_CHECK (wcwidth, int, (wchar_t));
+
 #include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "localcharset.h"
-
-#define ASSERT(expr) \
-  do									     \
-    {									     \
-      if (!(expr))							     \
-        {								     \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          abort ();							     \
-        }								     \
-    }									     \
-  while (0)
+#include "macros.h"
 
 int
 main ()
@@ -50,15 +41,15 @@ main ()
   /* Switch to an UTF-8 locale.  */
   if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL
       /* Check whether it's really an UTF-8 locale.
-	 On OpenBSD 4.0, the setlocale call succeeds only for the LC_CTYPE
-	 category and therefore returns "C/fr_FR.UTF-8/C/C/C/C", but the
-	 LC_CTYPE category is effectively set to an ASCII LC_CTYPE category;
-	 in particular, locale_charset() returns "ASCII".  */
+         On OpenBSD 4.0, the setlocale call succeeds only for the LC_CTYPE
+         category and therefore returns "C/fr_FR.UTF-8/C/C/C/C", but the
+         LC_CTYPE category is effectively set to an ASCII LC_CTYPE category;
+         in particular, locale_charset() returns "ASCII".  */
       && strcmp (locale_charset (), "UTF-8") == 0)
     {
       /* Test width of ASCII characters.  */
       for (wc = 0x20; wc < 0x7F; wc++)
-	ASSERT (wcwidth (wc) == 1);
+        ASSERT (wcwidth (wc) == 1);
 
       /* Test width of some non-spacing characters.  */
       ASSERT (wcwidth (0x0301) == 0);