diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:26:44 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:26:44 +0000 |
| commit | 35a0124c4a3305a8ad8c9858b4e4d6d7e27f2ce7 (patch) | |
| tree | 4645c5ace026f463bbfadd45815560f8641dbe4a /dbaccess/win32 | |
| parent | 51e0745267365490454e6d385fa842dacbdcd75c (diff) | |
INTEGRATION: CWS mingwport06 (1.2.14); FILE MERGED
2007/08/27 12:42:15 vg 1.2.14.2: #i75499# pragma for MSVC
2007/08/24 14:02:26 vg 1.2.14.1: #i80359# MinGW port efforts
Diffstat (limited to 'dbaccess/win32')
| -rw-r--r-- | dbaccess/win32/source/odbcconfig/odbcconfig.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/dbaccess/win32/source/odbcconfig/odbcconfig.cxx b/dbaccess/win32/source/odbcconfig/odbcconfig.cxx index e45718b83fac..2c691c5e07c3 100644 --- a/dbaccess/win32/source/odbcconfig/odbcconfig.cxx +++ b/dbaccess/win32/source/odbcconfig/odbcconfig.cxx @@ -4,9 +4,9 @@ * * $RCSfile: odbcconfig.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2007-07-24 12:11:10 $ + * last change: $Author: kz $ $Date: 2007-09-06 13:26:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,7 +36,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaccess.hxx" -#pragma once #ifndef __cplusplus #error Need C++ to compile #endif @@ -45,14 +44,18 @@ #define _UNICODE #include <tchar.h> +#ifdef _MSC_VER #pragma warning(push, 1) #pragma warning(disable:4005) +#endif #include <windows.h> #include <shellapi.h> #include <sqlext.h> +#ifdef _MSC_VER #pragma warning(pop) +#endif // the name of the library which contains the SQLManageDataSources function #define ODBC_UI_LIB_NAME L"ODBCCP32.DLL" @@ -130,7 +133,11 @@ HWND initInstance( HINSTANCE _hAppInstance ) } // main window function +#ifdef __MINGW32__ +extern "C" int APIENTRY WinMain( HINSTANCE _hAppInstance, HINSTANCE, LPSTR, int ) +#else extern "C" int APIENTRY _tWinMain( HINSTANCE _hAppInstance, HINSTANCE, LPTSTR, int ) +#endif { if ( !registerWindowClass( _hAppInstance ) ) return FALSE; |