]> git.djapps.eu Git - pkg/ggml/sources/llama.cpp/commitdiff
Fixed possible macro redefinition (#1892)
authorFrankHB <redacted>
Fri, 16 Jun 2023 18:25:01 +0000 (02:25 +0800)
committerGitHub <redacted>
Fri, 16 Jun 2023 18:25:01 +0000 (21:25 +0300)
MinGW libstdc++ may define `NOMINMAX` unconditionally. This fixes the case when it is already defined.

examples/main/main.cpp

index ef9e75fab9fe2c0ef9d4d758036b81c7fb4c6c91..a051fcbc5caf5db0a502fc0f8351e57516b439d4 100644 (file)
@@ -23,7 +23,9 @@
 #include <unistd.h>
 #elif defined (_WIN32)
 #define WIN32_LEAN_AND_MEAN
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 #include <signal.h>
 #endif