strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS mingwport05 (1.6.44); FILE MERGED

Browse source 
2007/06/25 11:42:42 vg 1.6.44.1: #78270# MinGW port efforts
This commit is contained in:
Oliver Bolte 2007-07-17 06:28:25 +00:00
parent 1724e0909f
commit 8634021d77
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
desktop/win32/source/applauncher/launcher.cxx
View file

@ -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 <malloc.h>
#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

8
desktop/win32/source/setup/setup_main.hxx
View file

@ -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; }