update from texinfo

[gnulib.git] / tests / test-linkedhash_list.c

diff --git a/tests/test-linkedhash_list.c b/tests/test-linkedhash_list.c
index f368b58..b51d9b9 100644 (file)
--- a/tests/test-linkedhash_list.c
+++ b/tests/test-linkedhash_list.c
@@ -16,13 +16,12 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "gl_linkedhash_list.h"
 
 #include <limits.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -60,7 +59,16 @@ string_hash (const void *x)
 }
 
 #define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(condition) if (!(condition)) abort ()
+#define ASSERT(expr) \
+  do                                                                        \
+    {                                                                       \
+      if (!(expr))                                                          \
+        {                                                                   \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();                                                         \
+        }                                                                   \
+    }                                                                       \
+  while (0)
 #define RANDOM(n) (rand () % (n))
 #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))]
 
@@ -107,17 +115,17 @@ main (int argc, char *argv[])
 
     /* Create list1.  */
     list1 = gl_list_create (GL_ARRAY_LIST,
-                            string_equals, string_hash, true,
+                            string_equals, string_hash, NULL, true,
                             initial_size, contents);
     /* Create list2.  */
     list2 = gl_list_create_empty (GL_LINKEDHASH_LIST,
-                                  string_equals, string_hash, true);
+                                  string_equals, string_hash, NULL, true);
     for (i = 0; i < initial_size; i++)
       gl_list_add_last (list2, contents[i]);
 
     /* Create list3.  */
     list3 = gl_list_create (GL_LINKEDHASH_LIST,
-                            string_equals, string_hash, true,
+                            string_equals, string_hash, NULL, true,
                             initial_size, contents);
 
     check_all (list1, list2, list3);