From: Georgi Gerganov <redacted>
Date: Tue, 7 Nov 2023 14:08:46 +0000 (+0200)
Subject: ggml : fix MIN / MAX macro re-definition
X-Git-Tag: upstream/1.7.4~1278
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=0cbef7542247584a369047793e9e4bf066b18e67;p=pkg%2Fggml%2Fsources%2Fwhisper.cpp

ggml : fix MIN / MAX macro re-definition
---

diff --git a/ggml.c b/ggml.c
index 018f0ce0..d1b7e94d 100644
--- a/ggml.c
+++ b/ggml.c
@@ -143,12 +143,6 @@ void ggml_print_backtrace(void) {
 }
 #endif
 
-#undef MIN
-#undef MAX
-
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-
 /*#define GGML_PERF*/
 #define GGML_DEBUG 0
 #define GGML_GELU_FP16
@@ -277,6 +271,12 @@ inline static void * ggml_aligned_malloc(size_t size) {
 // floating point type used to accumulate sums
 typedef double ggml_float;
 
+#undef MIN
+#undef MAX
+
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+
 //
 // global data
 //