ccutil: Fix and simplify implementation of variadic macro

The implementation for MS C did not pass the variable arguments to tprintf. The standard is supported since C99 / C++11, so one implementation is sufficient. Signed-off-by: Stefan Weil <[email protected]>
tesseract-ocr · Aug 29, 2016 · 1274874 · 1274874
1 parent b000dd2
commit 1274874
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/ccutil/errcode.h b/ccutil/errcode.h
@@ -87,21 +87,12 @@ const ERRCODE ASSERT_FAILED = "Assert failed";
                         __FILE__, __LINE__);                            \
   }
 
-#ifdef _MSC_VER
-#define ASSERT_HOST_MSG(x, msg, ...) if (!(x))                            \
+#define ASSERT_HOST_MSG(x, ...) if (!(x))                               \
   {                                                                     \
-    tprintf(msg);                                                       \
+    tprintf(__VA_ARGS__);                                               \
     ASSERT_FAILED.error(#x, ABORT, "in file %s, line %d",               \
                         __FILE__, __LINE__);                            \
   }
-#else
-#define ASSERT_HOST_MSG(x, msg...) if (!(x))                            \
-  {                                                                     \
-    tprintf(msg);                                                       \
-    ASSERT_FAILED.error(#x, ABORT, "in file %s, line %d",               \
-                        __FILE__, __LINE__);                            \
-  }
-#endif
 
 void signal_exit(int signal_code);