* rename signal to _signal in _tcase_add_test to avoid a

  symbol clash with /usr/include/sys/signal.h on OS X.

git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@416 64e312b2-a51f-0410-8e61-82d0ca0eb02a

diff --git a/src/check.c b/src/check.c
index 57b23485c4c93681d99ae52dabf66f5c15f349e4..1f244f1e8e58459ac409a68e4a994d214ece25a2 100644 (file)
--- a/src/check.c
+++ b/src/check.c
@@ -156,7 +156,7 @@ void suite_add_tcase (Suite *s, TCase *tc)
   list_add_end (s->tclst, tc);
 }
 
-void _tcase_add_test (TCase *tc, TFun fn, const char *name, int signal, int start, int end)
+void _tcase_add_test (TCase *tc, TFun fn, const char *name, int _signal, int start, int end)
 {
   TF * tf;
   if (tc == NULL || fn == NULL || name == NULL)
@@ -165,7 +165,7 @@ void _tcase_add_test (TCase *tc, TFun fn, const char *name, int signal, int star
   tf->fn = fn;
   tf->loop_start = start;
   tf->loop_end = end;
-  tf->signal = signal; /* 0 means no signal expected */
+  tf->signal = _signal; /* 0 means no signal expected */
   tf->name = name;
   list_add_end (tc->tflst, tf);
 }

diff --git a/src/check.h.in b/src/check.h.in
index 8de6a0a56a4ea438f3976e09eb8e8995c6f7a8de..c7dcb79bd536984e194a22a250c4a117ab1b72a9 100644 (file)
--- a/src/check.h.in
+++ b/src/check.h.in
@@ -137,7 +137,7 @@ TCase * CK_EXPORT tcase_create (const char *name);
 /* Add a test function to a test case
   (function version -- use this when the macro won't work
 */
-void CK_EXPORT _tcase_add_test (TCase *tc, TFun tf, const char *fname, int signal, int start, int end);
+void CK_EXPORT _tcase_add_test (TCase *tc, TFun tf, const char *fname, int _signal, int start, int end);
 
 /* Add unchecked fixture setup/teardown functions to a test case