Mercurial > mxe-octave
changeset 2417:f0342e9f2462
Merge pull request #20 from mgehre/master
Rename DllMain to package_DllMain
| author | Volker Grabsch <vog@notjusthosting.com> |
|---|---|
| date | Mon, 16 Apr 2012 07:14:43 -0700 |
| parents | 7ddb24a19c22 (current diff) 48a42036c919 (diff) |
| children | 778c0530ecff |
| files | |
| diffstat | 7 files changed, 93 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/atk-1-DllMain.patch Mon Apr 16 07:14:43 2012 -0700 @@ -0,0 +1,12 @@ +diff -uNr atk-2.2.0-orig/atk/atkobject.c atk-2.2.0/atk/atkobject.c +--- atk-2.2.0-orig/atk/atkobject.c 2011-09-19 19:06:54.000000000 +0200 ++++ atk-2.2.0/atk/atkobject.c 2012-04-14 20:26:12.763814596 +0200 +@@ -366,7 +366,7 @@ + static HMODULE atk_dll; + + BOOL WINAPI +-DllMain (HINSTANCE hinstDLL, ++atk_DllMain (HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved) + {
--- a/src/atk.mk Mon Apr 16 23:38:26 2012 +1000 +++ b/src/atk.mk Mon Apr 16 07:14:43 2012 -0700 @@ -18,7 +18,6 @@ endef define $(PKG)_BUILD - $(SED) -i 's,DllMain,static _disabled_DllMain,' '$(1)/atk/atkobject.c' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/cairo-1-DllMain.patch Mon Apr 16 07:14:43 2012 -0700 @@ -0,0 +1,18 @@ +diff -uNr cairo-1.10.2-orig/src/cairo-system.c cairo-1.10.2/src/cairo-system.c +--- cairo-1.10.2-orig/src/cairo-system.c 2010-06-18 13:47:14.000000000 +0200 ++++ cairo-1.10.2/src/cairo-system.c 2012-04-14 22:01:27.848928137 +0200 +@@ -70,12 +70,12 @@ + + /* declare to avoid "no previous prototype for 'DllMain'" warning */ + BOOL WINAPI +-DllMain (HINSTANCE hinstDLL, ++cairo_DllMain (HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved); + + BOOL WINAPI +-DllMain (HINSTANCE hinstDLL, ++cairo_DllMain (HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved) + {
--- a/src/gdk-pixbuf-1-fixes.patch Mon Apr 16 23:38:26 2012 +1000 +++ b/src/gdk-pixbuf-1-fixes.patch Mon Apr 16 07:14:43 2012 -0700 @@ -27,7 +27,7 @@ BOOL WINAPI -DllMain (HINSTANCE hinstDLL, -+static _disabled_DllMain (HINSTANCE hinstDLL, ++gdkpixbuf_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/glib-2-DllMain.patch Mon Apr 16 07:14:43 2012 -0700 @@ -0,0 +1,59 @@ +diff -uNr glib-2.28.8-orig/gio/giomodule.c glib/gio/giomodule.c +--- glib-2.28.8-orig/gio/giomodule.c 2011-01-05 22:44:06.000000000 +0100 ++++ glib/gio/giomodule.c 2011-11-23 21:04:43.867004895 +0100 +@@ -489,10 +489,8 @@ + + static HMODULE gio_dll = NULL; + +-#ifdef DLL_EXPORT +- + BOOL WINAPI +-DllMain (HINSTANCE hinstDLL, ++gio_DllMain (HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved) + { +@@ -502,8 +500,6 @@ + return TRUE; + } + +-#endif +- + #undef GIO_MODULE_DIR + + /* GIO_MODULE_DIR is used only in code called just once, +diff -uNr glib-2.28.8-orig/glib/gutils.c glib/glib/gutils.c +--- glib-2.28.8-orig/glib/gutils.c 2011-06-06 01:18:49.000000000 +0200 ++++ glib/glib/gutils.c 2011-11-23 21:05:07.822988144 +0100 +@@ -144,10 +144,8 @@ + + static HMODULE glib_dll = NULL; + +-#ifdef DLL_EXPORT +- + BOOL WINAPI +-DllMain (HINSTANCE hinstDLL, ++glib_DllMain (HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved) + { +@@ -157,8 +155,6 @@ + return TRUE; + } + +-#endif +- + gchar * + _glib_get_dll_directory (void) + { +@@ -166,10 +162,8 @@ + gchar *p; + wchar_t wc_fn[MAX_PATH]; + +-#ifdef DLL_EXPORT + if (glib_dll == NULL) + return NULL; +-#endif + + /* This code is different from that in + * g_win32_get_package_installation_directory_of_module() in that
--- a/src/gtk2-1-fixes.patch Mon Apr 16 23:38:26 2012 +1000 +++ b/src/gtk2-1-fixes.patch Mon Apr 16 07:14:43 2012 -0700 @@ -18,7 +18,7 @@ int __stdcall -DllMain (HINSTANCE hinstDLL, -+static _disabled_DllMain (HINSTANCE hinstDLL, ++gdk_DllMain (HINSTANCE hinstDLL, DWORD dwReason, LPVOID reserved) { @@ -31,7 +31,7 @@ BOOL WINAPI -DllMain (HINSTANCE hinstDLL, -+static _disabled_DllMain (HINSTANCE hinstDLL, ++gtk_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
--- a/src/pango-1-fixes.patch Mon Apr 16 23:38:26 2012 +1000 +++ b/src/pango-1-fixes.patch Mon Apr 16 07:14:43 2012 -0700 @@ -24,7 +24,7 @@ BOOL WINAPI -DllMain (HINSTANCE hinstDLL, -+static _disabled_DllMain (HINSTANCE hinstDLL, ++pango_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {