Merge xmrig-proxy v6.15.0 into master

MoneroOcean · Aug 31, 2021 · cad5140 · cad5140
1 parent aaee9fd
commit cad5140
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/proxy/Miner.cpp b/src/proxy/Miner.cpp
@@ -55,6 +55,9 @@
 #include <cstdio>
 #include <cstring>
 
+#ifdef _MSC_VER
+#undef GetObject
+#endif
 
 namespace xmrig {
     static int64_t nextId = 0;