User: kz Date: 2007-09-06 13:26:47+0000 Modified: dba/dbaccess/win32/source/odbcconfig/odbcconfig.cxx
Log: 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 File Changes: Directory: /dba/dbaccess/win32/source/odbcconfig/ ================================================= File [changed]: odbcconfig.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/win32/source/odbcconfig/odbcconfig.cxx?r1=1.2&r2=1.3 Delta lines: +11 -4 -------------------- --- odbcconfig.cxx 2007-07-24 12:11:10+0000 1.2 +++ odbcconfig.cxx 2007-09-06 13:26:44+0000 1.3 @@ -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 @@ } // 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; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
