From 8634021d77402fd3da51c1fe1099ec8efe8b673e Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Tue, 17 Jul 2007 06:28:25 +0000 Subject: [PATCH] INTEGRATION: CWS mingwport05 (1.6.44); FILE MERGED 2007/06/25 11:42:42 vg 1.6.44.1: #78270# MinGW port efforts --- desktop/win32/source/applauncher/launcher.cxx | 8 ++++++-- desktop/win32/source/setup/setup_main.hxx | 8 ++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/desktop/win32/source/applauncher/launcher.cxx b/desktop/win32/source/applauncher/launcher.cxx index 06f565c39dd7..8a69a1d94ff6 100644 --- a/desktop/win32/source/applauncher/launcher.cxx +++ b/desktop/win32/source/applauncher/launcher.cxx @@ -4,9 +4,9 @@ * * $RCSfile: launcher.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: hr $ $Date: 2007-06-27 17:55:43 $ + * last change: $Author: obo $ $Date: 2007-07-17 07:28:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -56,7 +56,11 @@ #include +#ifdef __MINGW32__ +extern "C" int APIENTRY WinMain( HINSTANCE, HINSTANCE, LPSTR, int ) +#else extern "C" int APIENTRY _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int ) +#endif { // Retreive startup info diff --git a/desktop/win32/source/setup/setup_main.hxx b/desktop/win32/source/setup/setup_main.hxx index 0d1e63bd45ca..3d176c730592 100644 --- a/desktop/win32/source/setup/setup_main.hxx +++ b/desktop/win32/source/setup/setup_main.hxx @@ -4,9 +4,9 @@ * * $RCSfile: setup_main.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: gm $ $Date: 2007-05-10 11:08:54 $ + * last change: $Author: obo $ $Date: 2007-07-17 07:28:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -57,8 +57,8 @@ public: virtual boolean CheckVersion() = 0; virtual boolean Install( long nLanguage ) = 0; - virtual UINT GetError() const = NULL; - virtual void DisplayError( UINT nErr ) const = NULL; + virtual UINT GetError() const = 0; + virtual void DisplayError( UINT nErr ) const = 0; void SetError( UINT nErr ) { m_uiRet = nErr; } boolean IsWin9x() const { return m_bIsWin9x; }