diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-05 16:25:38 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-05 16:26:13 +0200 |
| commit | be8855ebe4e5b978971d77df3d40e051d09597a7 (patch) | |
| tree | 962b8334dac47a7a3c4b80d60481680ce15bb027 /vcl | |
| parent | 5eab53585c4ec52fe82f9b45273ca2f35a1fc1ca (diff) | |
Some more win64 "fixes"
Change-Id: Id3de720a7ab28499644881e628a18f99121cb3c9
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/win/source/app/saltimer.cxx | 7 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salprn.cxx | 4 | ||||
| -rw-r--r-- | vcl/win/source/window/salframe.cxx | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx index dbe4ddc2d230..2e94d0173e2a 100644 --- a/vcl/win/source/app/saltimer.cxx +++ b/vcl/win/source/app/saltimer.cxx @@ -22,10 +22,11 @@ #include <win/saltimer.h> #include <win/salinst.h> -#ifdef __MINGW32__ +#if defined ( __MINGW32__ ) && !defined ( _WIN64 ) #include <sehandler.hxx> #endif + // ======================================================================= // Maximale Periode @@ -93,7 +94,7 @@ void WinSalTimer::Stop() void CALLBACK SalTimerProc( HWND, UINT, UINT_PTR nId, DWORD ) { -#ifdef __MINGW32__ +#if defined ( __MINGW32__ ) && !defined ( _WIN64 ) jmp_buf jmpbuf; __SEHandler han; if (__builtin_setjmp(jmpbuf) == 0) @@ -135,7 +136,7 @@ void CALLBACK SalTimerProc( HWND, UINT, UINT_PTR nId, DWORD ) ImplSalStartTimer( 10, TRUE ); } } -#ifdef __MINGW32__ +#if defined ( __MINGW32__ ) && !defined ( _WIN64 ) han.Reset(); #else __except(WinSalInstance::WorkaroundExceptionHandlingInUSER32Lib(GetExceptionCode(), GetExceptionInformation())) diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx index 113fb1887d46..680109f8a919 100644 --- a/vcl/win/source/gdi/salprn.cxx +++ b/vcl/win/source/gdi/salprn.cxx @@ -49,11 +49,11 @@ #include <malloc.h> -#ifdef __MINGW32__ +#if defined ( __MINGW32__ ) && !defined ( _WIN64 ) #include <sehandler.hxx> #endif -#ifdef __MINGW32__ +#if defined ( __MINGW32__ ) && !defined ( _WIN64 ) #define CATCH_DRIVER_EX_BEGIN \ jmp_buf jmpbuf; \ __SEHandler han; \ diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 8ced16ce61b3..76de88b16438 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -86,7 +86,7 @@ using ::std::max; #include <time.h> -#ifdef __MINGW32__ +#if defined ( __MINGW32__ ) && !defined ( _WIN64 ) #include <sehandler.hxx> #endif @@ -6059,7 +6059,7 @@ LRESULT CALLBACK SalFrameWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM l { int bDef = TRUE; LRESULT nRet = 0; -#ifdef __MINGW32__ +#if defined ( __MINGW32__ ) && !defined ( _WIN64 ) jmp_buf jmpbuf; __SEHandler han; if (__builtin_setjmp(jmpbuf) == 0) @@ -6071,7 +6071,7 @@ LRESULT CALLBACK SalFrameWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM l #endif nRet = SalFrameWndProc( hWnd, nMsg, wParam, lParam, bDef ); } -#ifdef __MINGW32__ +#if defined ( __MINGW32__ ) && !defined ( _WIN64 ) han.Reset(); #else __except(WinSalInstance::WorkaroundExceptionHandlingInUSER32Lib(GetExceptionCode(), GetExceptionInformation())) |