From 42588dee24d6531155adab4a1a4affbf0a5d7243 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Mon, 26 Sep 2022 23:28:39 +0200
Subject: [PATCH] fix minor bugs

---
 Utils/MathUtils.h   | 34 ++++--------------------
 Utils/StringUtils.h |  2 +-
 Utils/TestUtils.h   | 64 +++++++++++++--------------------------------
 3 files changed, 24 insertions(+), 76 deletions(-)

diff --git a/Utils/MathUtils.h b/Utils/MathUtils.h
index 30bbd09..2b7bdf7 100644
--- a/Utils/MathUtils.h
+++ b/Utils/MathUtils.h
@@ -12,34 +12,10 @@
 
 #define OMS_PI 3.14159265358979323846
 
-#ifdef _MSC_VER
-    #define oms_max(a, b) ((a) > (b) ? (a) : (b))
-    #define oms_min(a, b) ((a) > (b) ? (b) : (a))
-    #define oms_abs(a) ((a) > 0 ? (a) : -(a))
-    #define oms_deg2rad(angle) ((angle) * OMS_PI / 180.0)
-    #define oms_rad2deg(angle) ((angle) * 180.0 / OMS_PI)
-#else
-    #define oms_max(a, b) \
-        ( __typeof__(a) _a = (a); \
-            __typeof__(b) _b = (b); \
-            _a > _b ? _a : _b; )
-
-    #define oms_min(a, b) \
-        ( __typeof__(a) _a = (a); \
-            __typeof__(b) _b = (b); \
-            _a < _b ? _a : _b; )
-
-    #define oms_abs(a) \
-        ( __typeof__(a) _a = (a); \
-            _a > 0 ? _a : -_a; )
-
-    #define oms_deg2rad(angle) \
-        ( __typeof__(angle) _angle = (angle); \
-            (_angle) * OMS_PI / 180.0; )
-
-    #define oms_rad2deg(angle) \
-        ( __typeof__(angle) _angle = (angle); \
-            (_angle) * 180.0 / OMS_PI; )
-#endif
+#define oms_max(a, b) ((a) > (b) ? (a) : (b))
+#define oms_min(a, b) ((a) > (b) ? (b) : (a))
+#define oms_abs(a) ((a) > 0 ? (a) : -(a))
+#define oms_deg2rad(angle) ((angle) * OMS_PI / 180.0)
+#define oms_rad2deg(angle) ((angle) * 180.0 / OMS_PI)
 
 #endif
diff --git a/Utils/StringUtils.h b/Utils/StringUtils.h
index 5c71844..deee0e1 100644
--- a/Utils/StringUtils.h
+++ b/Utils/StringUtils.h
@@ -103,7 +103,7 @@ namespace Utils {
                     --i;
                     ++diffIndex;
 
-                    continue
+                    continue;
                 }
 
                 diffValues[diffIndex] = (char *) malloc((strlen(from[i - 1]) + 1) * sizeof(char));
diff --git a/Utils/TestUtils.h b/Utils/TestUtils.h
index 1848fe0..9001571 100644
--- a/Utils/TestUtils.h
+++ b/Utils/TestUtils.h
@@ -13,52 +13,24 @@
 #include <stdio.h>
 #include "MathUtils.h"
 
-#ifdef _MSC_VER
-    #define ASSERT_EQUALS(a, b, t1, t2) (\
-            if ((a) == (b)) { \
-                printf("."); \
-            } else { \
-                printf("[F]"); \
-                printf("\n\n%s - %i: ", __FILE__, __LINE__); \
-                printf((t1), (a)); printf(" != "); printf((t2), (b)); printf("\n"); \
-                return 0; } \
-        )
+#define ASSERT_EQUALS(a, b, t1, t2) (\
+        if ((a) == (b)) { \
+            printf("."); \
+        } else { \
+            printf("[F]"); \
+            printf("\n\n%s - %i: ", __FILE__, __LINE__); \
+            printf((t1), (a)); printf(" != "); printf((t2), (b)); printf("\n"); \
+            return 0; } \
+    )
 
-    #define ASSERT_EQUALS_WITH_DELTA(a, b, delta, t1, t2) (\
-            if (oms_abs((a) - (b)) <= (delta)) { \
-                printf("."); \
-            } else { \
-                printf("[F]"); \
-                printf("\n\n%s - %i: ", __FILE__, __LINE__); \
-                printf((t1), (a)); printf(" != "); printf((t2), (b)); printf("\n"); \
-                return 0; } \
-        )
-#else
-    #define ASSERT_EQUALS(a, b, t1, t2) \
-        ({ __typeof__ (a) _a = (a); \
-            __typeof__ (b) _b = (b); \
-            if (_a == _b) { \
-                printf("."); \
-            } else { \
-                printf("[F]"); \
-                printf("\n\n%s - %i: ", __FILE__, __LINE__); \
-                printf(t1, _a); printf(" != "); printf(t2, _b); printf("\n"); \
-                return 0; } \
-        })
-
-    #define ASSERT_EQUALS_WITH_DELTA(a, b, delta, t1, t2) \
-        ({ __typeof__ (a) _a = (a); \
-            __typeof__ (b) _b = (b); \
-            __typeof__ (delta) _delta = (delta); \
-            __typeof__ (delta) _d = (_a - _b); \
-            if (oms_abs(_d) <= _delta) { \
-                printf("."); \
-            } else { \
-                printf("[F]"); \
-                printf("\n\n%s - %i: ", __FILE__, __LINE__); \
-                printf(t1, _a); printf(" != "); printf(t2, _b); printf("\n"); \
-                return 0; } \
-        })
-#endif
+#define ASSERT_EQUALS_WITH_DELTA(a, b, delta, t1, t2) (\
+        if (oms_abs((a) - (b)) <= (delta)) { \
+            printf("."); \
+        } else { \
+            printf("[F]"); \
+            printf("\n\n%s - %i: ", __FILE__, __LINE__); \
+            printf((t1), (a)); printf(" != "); printf((t2), (b)); printf("\n"); \
+            return 0; } \
+    )
 
 #endif