change for egcs-1.1.2

diff --git a/src/ccunit/CCUnitMakeSuite.c b/src/ccunit/CCUnitMakeSuite.c
index 755cf0f..7bd5ff7 100644 (file)
--- a/src/ccunit/CCUnitMakeSuite.c
+++ b/src/ccunit/CCUnitMakeSuite.c
@@ -44,7 +44,7 @@
 #  define SETVBUF(FP,PTR,TYP,SZ) setvbuf(FP,PTR,TYP,SZ)
 #endif
 
-#if defined(unix) || defined(__MACH__) || defined(__CYGWIN__)
+#if defined(__MACH__) || defined(__CYGWIN__)
 #define DIRSEP '/'                             /**< directory separetor */
 #elif defined (__WIN32__) || defined (__MSDOS__)
 #define DIRSEP '\\'                            /**< directory separetor */

diff --git a/tests/testReadSuite.c b/tests/testReadSuite.c
index 86d0392..61681bc 100644 (file)
--- a/tests/testReadSuite.c
+++ b/tests/testReadSuite.c
@@ -93,8 +93,9 @@ void test_readSuite_skip_doxycomment ()
   bool found = false;
   while (fgets (line, sizeof (line), lfp) != NULL)
     {
-      if (strcmp (line, "LOG: comment content: "
-                 "\"test suite: read test suite file.\"\n") == 0)
+      char* content = strstr (line, "comment content: ");
+      if (content && strcmp (content, "comment content: "
+                            "\"test suite: read test suite file.\"\n") == 0)
        {
          found = true;
          return;