From: Georgi Gerganov <redacted>
Date: Thu, 27 Feb 2025 08:39:13 +0000 (+0200)
Subject: common :  fix build min/max (#2845)
X-Git-Tag: upstream/1.7.4+203~43
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=9f83f67221814dab0477c3970fa5f618ac1e2a2b;p=pkg%2Fggml%2Fsources%2Fwhisper.cpp

common :  fix build min/max (#2845)

* common : try to fix build

* cont : try another fix
---

diff --git a/examples/common.cpp b/examples/common.cpp
index ec1fa191..f114e84d 100644
--- a/examples/common.cpp
+++ b/examples/common.cpp
@@ -7,6 +7,12 @@
 #define STB_VORBIS_HEADER_ONLY
 #include "stb_vorbis.c"    /* Enables Vorbis decoding. */
 
+#ifdef _WIN32
+#ifndef NOMINMAX
+    #define NOMINMAX
+#endif
+#endif
+
 #define MA_NO_DEVICE_IO
 #define MA_NO_THREADING
 #define MA_NO_ENCODING
@@ -17,11 +23,11 @@
 #include "miniaudio.h"
 
 #include <cmath>
+#include <codecvt>
 #include <cstring>
 #include <fstream>
-#include <regex>
 #include <locale>
-#include <codecvt>
+#include <regex>
 #include <sstream>
 
 #if defined(_MSC_VER)