nominmax

Author: netrunnereve

ggml/src/ggml-vulkan/vulkan-shaders/vulkan-shaders-gen.cpp

@@ -1,5 +1,3 @@
-
-
 #include <iostream>
 #include <fstream>
 #include <sstream>
@@ -22,6 +20,7 @@
 #include <sys/types.h>
 
 #ifdef _WIN32
+    #define NOMINMAX
     #include <windows.h>
     #include <direct.h> // For _mkdir on Windows
 #else
@@ -305,7 +304,7 @@ void string_to_spv(const std::string& _name, const std::string& in_fname, const
     {
         // wait until fewer than N compiles are in progress.
         // 16 is an arbitrary limit, the goal is to avoid "failed to create pipe" errors.
-        uint32_t N = (std::max)(1u, (std::min)(16u, std::thread::hardware_concurrency()));
+        uint32_t N = std::max(1u, std::min(16u, std::thread::hardware_concurrency()));
         std::unique_lock<std::mutex> guard(compile_count_mutex);
         while (compile_count >= N) {
             compile_count_cond.wait(guard);