From 441f043162ec10b10f70c0d59540f41154944528 Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Wed, 11 Feb 2009 17:39:29 +0000
Subject: [PATCH] Tue Feb 10 07:18:22 CST 2009  Pekka Pessi
 <first.last@nokia.com>   * s2check: fixed s2_tcase_add_test()

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11876 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 libs/sofia-sip/s2check/s2check.h |  6 ++++--
 libs/sofia-sip/s2check/s2tcase.c | 13 +++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/libs/sofia-sip/s2check/s2check.h b/libs/sofia-sip/s2check/s2check.h
index b24addd031..772d09e94c 100644
--- a/libs/sofia-sip/s2check/s2check.h
+++ b/libs/sofia-sip/s2check/s2check.h
@@ -33,6 +33,10 @@
  * @author Pekka Pessi <Pekka.Pessi@nokia.com>
  */
 
+#ifndef SU_CONFIG_H
+#include <sofia-sip/su_config.h>
+#endif
+
 #include <check.h>
 
 SOFIA_BEGIN_DECLS
@@ -43,8 +47,6 @@ SOFIA_BEGIN_DECLS
 
 void s2_tcase_add_test(TCase *, TFun, char const *name);
 
-
-
 SOFIA_END_DECLS
 
 #endif /* S2CHECK_H */
diff --git a/libs/sofia-sip/s2check/s2tcase.c b/libs/sofia-sip/s2check/s2tcase.c
index a5ba648ca1..e743019762 100644
--- a/libs/sofia-sip/s2check/s2tcase.c
+++ b/libs/sofia-sip/s2check/s2tcase.c
@@ -26,6 +26,13 @@
 
 #if HAVE_CHECK
 
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include <check.h>
+
 #if HAVE_FNMATCH_H
 #include <fnmatch.h>
 #endif
@@ -33,8 +40,6 @@
 static char const * const default_patterns[] = { "*", NULL };
 static char const * const *test_patterns = default_patterns;
 
-#undef tcase_add_test
-
 /** tcase_add_test() replacement.
  *
  * A special version of tcase_add_test() that inserts test function into
@@ -50,7 +55,7 @@ void s2_tcase_add_test(TCase *tc, TFun tf, char const *name)
       if (strcmp(*patterns, "*")) {
 	printf("%s: running\n", name);
       }
-      tcase_add_test(tc, tf, name, 0, 0, 1);
+      _tcase_add_test(tc, tf, name, 0, 0, 1);
       return;
     }
   }
@@ -60,7 +65,7 @@ void s2_tcase_add_test(TCase *tc, TFun tf, char const *name)
       if (strcmp(*patterns, "*")) {
 	printf("%s: running\n", name);
       }
-      tcase_add_test(tc, tf, name, 0, 0, 1);
+      _tcase_add_test(tc, tf, name, 0, 0, 1);
       return;
     }
   }