Define NOMINMAX ahead of windows.h

duckdb · Aug 5, 2021 · 34327eb · 34327eb
1 parent 565329c
commit 34327eb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/execution/operator/helper/physical_load.cpp b/src/execution/operator/helper/physical_load.cpp
@@ -6,6 +6,9 @@
 #ifndef _WIN32
 #include <dlfcn.h>
 #else
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
 #include <windows.h>
 
 #define RTLD_LAZY  0

diff --git a/tools/nodejs/binding.gyp b/tools/nodejs/binding.gyp
@@ -56,15 +56,15 @@
                         ]
                     },
                 ],  # OS=="win"
-            ],  # conditions# uncomment this to build against existing lib
-#             "libraries": [
-#               "/Users/hannes/source/duckdb/build/release/src/libduckdb_static.a",
-#               "/Users/hannes/source/duckdb/build/release/third_party/fmt/libfmt.a",
-#               "/Users/hannes/source/duckdb/build/release/third_party/libpg_query/libpg_query.a",
-#               "/Users/hannes/source/duckdb/build/release/third_party/utf8proc/libutf8proc.a",
-#               "/Users/hannes/source/duckdb/build/release/third_party/re2/libduckdb_re2.a"
-#
-#               ]
+            ],  # conditions
+            # uncomment this to build against existing lib
+            # "libraries": [
+            #     "/Users/hannes/source/duckdb/build/release/src/libduckdb_static.a",
+            #     "/Users/hannes/source/duckdb/build/release/third_party/fmt/libfmt.a",
+            #     "/Users/hannes/source/duckdb/build/release/third_party/libpg_query/libpg_query.a",
+            #     "/Users/hannes/source/duckdb/build/release/third_party/utf8proc/libutf8proc.a",
+            #     "/Users/hannes/source/duckdb/build/release/third_party/re2/libduckdb_re2.a"
+            # ]
         },
         {
             "target_name": "action_after_build",