diff options
| -rw-r--r-- | src/gdk-pixbuf-1-fixes.patch | 29 | ||||
| -rw-r--r-- | src/libgsf-2-fixes.patch | 26 |
2 files changed, 55 insertions, 0 deletions
diff --git a/src/gdk-pixbuf-1-fixes.patch b/src/gdk-pixbuf-1-fixes.patch new file mode 100644 index 0000000..4cb0e9f --- /dev/null +++ b/src/gdk-pixbuf-1-fixes.patch @@ -0,0 +1,29 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +Contains ad hoc patches for cross building. +commit d5e7a81cbe6339e1d0dbf97f8814c28e2c806d80 +Author: Mark Brand <mabrand@mabrand.nl> +Date: Fri Sep 24 23:31:24 2010 +0200 + + s,DllMain,static _disabled_DllMain, + +diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c +index aa4964f..c925934 100644 +--- a/gdk-pixbuf/gdk-pixbuf-io.c ++++ b/gdk-pixbuf/gdk-pixbuf-io.c +@@ -226,12 +226,12 @@ skip_space (const char **pos) + + #ifdef G_OS_WIN32 + +-/* DllMain function needed to tuck away the gdk-pixbuf DLL handle */ ++/* static _disabled_DllMain function needed to tuck away the gdk-pixbuf DLL handle */ + + static HMODULE gdk_pixbuf_dll; + + BOOL WINAPI +-DllMain (HINSTANCE hinstDLL, ++static _disabled_DllMain (HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved) + { diff --git a/src/libgsf-2-fixes.patch b/src/libgsf-2-fixes.patch new file mode 100644 index 0000000..331f066 --- /dev/null +++ b/src/libgsf-2-fixes.patch @@ -0,0 +1,26 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +Contains ad hoc patches for cross building. +commit 908f4325d4977e67dc1d1840ce3e67bb9492de71 +Author: Mark Brand <mabrand@mabrand.nl> +Date: Fri Sep 24 23:34:26 2010 +0200 + + s,DllMain,static _disabled_DllMain, + +diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c +index 4e54b09..b8261e5 100644 +--- a/gsf/gsf-utils.c ++++ b/gsf/gsf-utils.c +@@ -109,9 +109,9 @@ static GTypeModule *static_type_module = NULL; + #include <windows.h> + static HMODULE gsf_dll_hmodule; + BOOL WINAPI +-DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); ++static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); + BOOL WINAPI +-DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved) ++static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved) + { + if (fdwReason == DLL_PROCESS_ATTACH) gsf_dll_hmodule = hinstDLL; + return TRUE; |