X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-vasnprintf-posix2.c;h=35b49f8692344943a66cc7cd94c9f29b84e19a62;hb=f5d7314bdeb3d2022ed572f48feba6546baf5f5b;hp=da664928332489291ced9c280a817dba1f1e17d8;hpb=11a5f14838519ffd46707b750afbfffebcb3ab44;p=gnulib.git

diff --git a/tests/test-vasnprintf-posix2.c b/tests/test-vasnprintf-posix2.c
index da6649283..35b49f869 100644
--- a/tests/test-vasnprintf-posix2.c
+++ b/tests/test-vasnprintf-posix2.c
@@ -1,10 +1,10 @@
 /* Test of POSIX compatible vasnprintf() and asnprintf() functions.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,14 +12,11 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "vasnprintf.h"
 
@@ -27,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) if (!(expr)) abort ();
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
@@ -42,29 +39,25 @@ main (int argc, char *argv[])
     char *result = asnprintf (NULL, &length, "%.1a", 1.0);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "0x1,0p+0") == 0
-	    || strcmp (result, "0x2,0p-1") == 0
-	    || strcmp (result, "0x4,0p-2") == 0
-	    || strcmp (result, "0x8,0p-3") == 0);
+            || strcmp (result, "0x2,0p-1") == 0
+            || strcmp (result, "0x4,0p-2") == 0
+            || strcmp (result, "0x8,0p-3") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
 
-#if HAVE_LONG_DOUBLE
-
   /* Test that a locale dependent decimal point is used.  */
   {
     size_t length;
     char *result = asnprintf (NULL, &length, "%.1La", 1.0L);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "0x1,0p+0") == 0
-	    || strcmp (result, "0x2,0p-1") == 0
-	    || strcmp (result, "0x4,0p-2") == 0
-	    || strcmp (result, "0x8,0p-3") == 0);
+            || strcmp (result, "0x2,0p-1") == 0
+            || strcmp (result, "0x4,0p-2") == 0
+            || strcmp (result, "0x8,0p-3") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
 
-#endif
-
   return 0;
 }