Mercurial > mxe-octave

changeset 2395:0bec20cb78f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
atk: rename DllMain to atk_DllMain
author Matthias Gehre <M.Gehre@gmx.de>
date Sat, 14 Apr 2012 20:31:14 +0200
parents 295e88579d64
children f3e8d1172278
files src/atk-1-DllMain.patch src/atk.mk
diffstat 2 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/atk-1-DllMain.patch	Sat Apr 14 20:31:14 2012 +0200
@@ -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	Sun Apr 08 16:13:59 2012 +0200
+++ b/src/atk.mk	Sat Apr 14 20:31:14 2012 +0200
@@ -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 \