NEWS.stable: log cherry-pick [e446f25]->[c092018] relocatable-shell: Update suggested...

[gnulib.git] / tests / test-count-one-bits.c

diff --git a/tests/test-count-one-bits.c b/tests/test-count-one-bits.c
index 2375d7b..e283cba 100644 (file)
--- a/tests/test-count-one-bits.c
+++ b/tests/test-count-one-bits.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (C) 2007 Free Software Foundation
+ * Copyright (C) 2007-2014 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,9 +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 Ben Pfaff.  */
 
@@ -24,19 +22,8 @@
 
 #include <limits.h>
 #include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr)                                            \
-  do                                                            \
-    {                                                           \
-      if (!(expr))                                              \
-        {                                                       \
-          fprintf (stderr, "%s:%d: assertion \"%s\" failed\n",  \
-                   __FILE__, __LINE__, #expr);                  \
-          abort ();                                             \
-        }                                                       \
-    }                                                           \
-  while (0)
+#include "macros.h"
 
 #define UINT_BIT (sizeof (unsigned int) * CHAR_BIT)
 #define ULONG_BIT (sizeof (unsigned long int) * CHAR_BIT)