# HG changeset patch
# User Mark Brand <mabrand@mabrand.nl>
# Date 1285365255 -7200
# Node ID 92877f4655f94e47d987629eeeb5fd3cb0ee0f2f
# Parent  1acdcff4d88aed4cfada37fe72743e0b219a692b
remove stray DllMain from packages libgsf and gdk-pixbuf

These caused a problem linking librsvg.

diff -r 1acdcff4d88a -r 92877f4655f9 src/gdk-pixbuf-1-fixes.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gdk-pixbuf-1-fixes.patch	Fri Sep 24 23:54:15 2010 +0200
@@ -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 -r 1acdcff4d88a -r 92877f4655f9 src/libgsf-2-fixes.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libgsf-2-fixes.patch	Fri Sep 24 23:54:15 2010 +0200
@@ -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;