diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2010-09-24 21:54:15 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2010-09-24 21:54:15 (GMT) |
| commit | d743b1187c57eb3c190d5e9c243fab7d5c3c138c (patch) | |
| tree | 66c9750defb71cfc321d7a8f1b8f01bd024918fc /src/gdk-pixbuf-1-fixes.patch | |
| parent | c5a79d11659a5e25f42bf186565e489e046e94e9 (diff) | |
| download | mxe-d743b1187c57eb3c190d5e9c243fab7d5c3c138c.zip mxe-d743b1187c57eb3c190d5e9c243fab7d5c3c138c.tar.gz mxe-d743b1187c57eb3c190d5e9c243fab7d5c3c138c.tar.bz2 | |
remove stray DllMain from packages libgsf and gdk-pixbuf
These caused a problem linking librsvg.
Diffstat (limited to 'src/gdk-pixbuf-1-fixes.patch')
| -rw-r--r-- | src/gdk-pixbuf-1-fixes.patch | 29 |
1 files changed, 29 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) + { |