X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-vsnprintf-posix.c;h=8de5755611757e9797937d7a928a477c761c71a4;hb=217ec874c8e4610ce407f0204c4e3fe30b7c76ec;hp=aa2c9a9936595af7e1f37dd941dc5b5db4e13058;hpb=ee6d9baacd6be1baf7c81422f2f716e3fe280c05;p=gnulib.git

diff --git a/tests/test-vsnprintf-posix.c b/tests/test-vsnprintf-posix.c
index aa2c9a993..8de575561 100644
--- a/tests/test-vsnprintf-posix.c
+++ b/tests/test-vsnprintf-posix.c
@@ -1,10 +1,10 @@
 /* Test of POSIX compatible vsnprintf() function.
-   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,8 +12,7 @@
    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.  */
 
@@ -24,22 +23,13 @@
 #include <float.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do									     \
-    {									     \
-      if (!(expr))							     \
-        {								     \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          abort ();							     \
-        }								     \
-    }									     \
-  while (0)
+#include "macros.h"
+
+#include "test-snprintf-posix.h"
 
 static int
 my_snprintf (char *str, size_t size, const char *format, ...)
@@ -53,8 +43,6 @@ my_snprintf (char *str, size_t size, const char *format, ...)
   return ret;
 }
 
-#include "test-snprintf-posix.h"
-
 int
 main (int argc, char *argv[])
 {