X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-strsignal.c;h=cca3a3bf1dffb5287620a89f3f3909fbc311097a;hb=16b34ac99b135d6cd6c8c2cf1e277ee3b867d9ac;hp=8cc955bdc3f73bb51b47c8e586b2333c23d99596;hpb=e220635fc952c63b533873f2af39ec76aed4b4e3;p=gnulib.git

diff --git a/tests/test-strsignal.c b/tests/test-strsignal.c
index 8cc955bdc..cca3a3bf1 100644
--- a/tests/test-strsignal.c
+++ b/tests/test-strsignal.c
@@ -1,5 +1,5 @@
 /* Test of strsignal() function.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
    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
@@ -19,22 +19,14 @@
 
 #include <config.h>
 
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do									     \
-    {									     \
-      if (!(expr))							     \
-        {								     \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);						     \
-          abort ();							     \
-        }								     \
-    }									     \
-  while (0)
+#include "signature.h"
+SIGNATURE_CHECK (strsignal, char *, (int));
+
+#include <signal.h>
+
+#include "macros.h"
 
 #if HAVE_DECL_SYS_SIGLIST
 # define ASSERT_DESCRIPTION(got, expect)
@@ -44,9 +36,13 @@
 #endif
 
 int
-main (int argc, char **argv)
+main (void)
 {
-  char *str;
+  /* Work around bug in cygwin 1.5.25 <string.h> by declaring str as
+     const char *, even though strsignal is supposed to return char *.
+     At any rate, this doesn't hurt, since POSIX 200x states that "The
+     string pointed to shall not be modified by the application."  */
+  const char *str;
 
   /* We try a couple of signals, since not all signals are supported
      everywhere.  Notwithstanding the #ifdef for neatness, SIGINT should in