X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-mbscspn.c;h=0959ca4286f7685ab86f466a1e44e5380b3c81cc;hb=fb6aa6ad7dd950729f4e3349d89d4ad82761af61;hp=62a29e30a5acc0b2c89ac7811d98a10e91265a1e;hpb=6e362c93a149add1233d410f3cbc5ebd71ce6c46;p=gnulib.git

diff --git a/tests/test-mbscspn.c b/tests/test-mbscspn.c
index 62a29e30a..0959ca428 100644
--- a/tests/test-mbscspn.c
+++ b/tests/test-mbscspn.c
@@ -1,10 +1,10 @@
 /* Test of searching a string for a character among a given set of characters.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2011 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,21 +12,17 @@
    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 <string.h>
 
 #include <locale.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) if (!(expr)) abort ();
+#include "macros.h"
 
 int
 main ()