X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftest-array_list.c;h=7dc66b5590b06514aa493a7576afb90a70dc8708;hb=64c23b1aa245db3a5e67a4e64531f58fb955d7cf;hp=3cd1e3eacdec033c8053c71cf2057277435c5428;hpb=854caf986aa0d9a23058f873382851a5145e1924;p=gnulib.git

diff --git a/tests/test-array_list.c b/tests/test-array_list.c
index 3cd1e3eac..7dc66b559 100644
--- a/tests/test-array_list.c
+++ b/tests/test-array_list.c
@@ -16,13 +16,13 @@
    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_array_list.h"
+
+#include <stdio.h>
 #include <stdlib.h>
 
-#include "gl_array_list.h"
 #include "progname.h"
 
 static const char *objects[15] =
@@ -31,7 +31,16 @@ static const char *objects[15] =
   };
 
 #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))]
 
@@ -70,10 +79,10 @@ main (int argc, char *argv[])
       contents[i] = RANDOM_OBJECT ();
 
     /* Create list1.  */
-    list1 = gl_list_create (GL_ARRAY_LIST, NULL, NULL, true,
+    list1 = gl_list_create (GL_ARRAY_LIST, NULL, NULL, NULL, true,
                             initial_size, contents);
     /* Create list2.  */
-    list2 = gl_list_create_empty (GL_ARRAY_LIST, NULL, NULL, true);
+    list2 = gl_list_create_empty (GL_ARRAY_LIST, NULL, NULL, NULL, true);
     for (i = 0; i < initial_size; i++)
       gl_list_add_last (list2, contents[i]);