view src/atk-1-DllMain.patch @ 4472:0fdeee4cfe11

gnuplot: enable Qt terminal and set default to wxt * src/gnuplot.mk: Depend on qt5 and build with QT=1 QT_DIR=$(HOST_PREFIX)/qt QT_BIN_DIR=(BUILD_TOOLS_PREFIX)/bin, install gnuplot_qt.exe * src/gnuplot-1-fixes.patch: add to patchto allow override of QT tools and paths * installer-files/octave-firsttime.vbs: set GNUTERM=wxt * installer-files/octave.vbs: set GNUTERM=wxt * installer-files/octave.bat: set GNUTERM=wxt * installer-files/cmdshell.bat: set GNUTERM=wxt
author Mike Miller <mtmiller@octave.org>
date Wed, 06 Sep 2017 16:19:37 -0700
parents 1c7c6c090223
children
line wrap: on
line source

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
@@ -369,7 +369,11 @@
 static HMODULE atk_dll;
 
 BOOL WINAPI
+#ifdef DLL_EXPORT
 DllMain (HINSTANCE hinstDLL,
+#else
+atk_DllMain (HINSTANCE hinstDLL,
+#endif
 	 DWORD     fdwReason,
 	 LPVOID    lpvReserved)
 {