Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at devShellTools-shell 42 lines 1.4 kB view raw
1diff --git a/src/windows/pluginloader/apihook.c b/src/windows/pluginloader/apihook.c 2index 80bf726..6b80f70 100644 3--- a/src/windows/pluginloader/apihook.c 4+++ b/src/windows/pluginloader/apihook.c 5@@ -42,7 +42,9 @@ 6 #include "common/common.h" 7 #include "pluginloader.h" 8 9+#define new cnew 10 #include <windows.h> // for PVOID and other types 11+#undef new 12 #include <string.h> // for memset 13 14 void* patchDLLExport(PVOID ModuleBase, const char* functionName, void* newFunctionPtr){ 15diff --git a/src/windows/pluginloader/npnfunctions.c b/src/windows/pluginloader/npnfunctions.c 16index e4e38aa..19f29d5 100644 17--- a/src/windows/pluginloader/npnfunctions.c 18+++ b/src/windows/pluginloader/npnfunctions.c 19@@ -41,7 +41,9 @@ 20 #include "common/common.h" 21 #include "pluginloader.h" 22 23+#define new cnew 24 #include <windows.h> 25+#undef new 26 27 /* Shockwave sometimes calls the function with a wrong instance? Is this a wine bug? */ 28 NPP shockwaveInstanceBug = NULL; 29diff --git a/src/windows/pluginloader/pluginloader.c b/src/windows/pluginloader/pluginloader.c 30index 8f1170a..99dbceb 100644 31--- a/src/windows/pluginloader/pluginloader.c 32+++ b/src/windows/pluginloader/pluginloader.c 33@@ -50,7 +50,9 @@ 34 #include "pluginloader.h" 35 #include "apihook.h" 36 37+#define new cnew 38 #include <windows.h> 39+#undef new 40 #include <objbase.h> // for CoInitializeEx 41 #include <GL/gl.h> 42