diff options
Diffstat (limited to 'vcl/source/app')
-rw-r--r-- | vcl/source/app/settings.cxx | 6 | ||||
-rw-r--r-- | vcl/source/app/svapp.cxx | 2 | ||||
-rw-r--r-- | vcl/source/app/svmain.cxx | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 296684b3dfd9..cb84dbe0aaa6 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -21,7 +21,7 @@ #include <officecfg/Office/Common.hxx> -#ifdef WNT +#ifdef _WIN32 #include "win/svsys.h" #endif @@ -2472,7 +2472,7 @@ bool MiscSettings::GetDisablePrinting() const bool MiscSettings::GetEnableATToolSupport() const { -#ifdef WNT +#ifdef _WIN32 if( mxData->mnEnableATT == TRISTATE_INDET ) { // Check in the Windows registry if an AT tool wants Accessibility support to @@ -2540,7 +2540,7 @@ bool MiscSettings::GetEnableATToolSupport() const return mxData->mnEnableATT != TRISTATE_FALSE; } -#ifdef WNT +#ifdef _WIN32 void MiscSettings::SetEnableATToolSupport( bool bEnable ) { if ( (bEnable ? TRISTATE_TRUE : TRISTATE_FALSE) != mxData->mnEnableATT ) diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 675a84893fe2..2ed5292eb121 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -540,7 +540,7 @@ void Application::ReAcquireSolarMutex(sal_uLong const nReleased) // 0 would mean that events/timers will be handled without locking // SolarMutex (racy) SAL_WARN_IF(nReleased == 0, "vcl", "SolarMutexReleaser without SolarMutex"); -#ifdef WNT +#ifdef _WIN32 if (nReleased == 0 || ImplGetSVData()->mbDeInit) //do not Yield in DeInitVCL AcquireSolarMutex(nReleased); else diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index a8bac5775b59..c7bcb9191dcb 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -44,7 +44,7 @@ #include <vcl/embeddedfontshelper.hxx> #include <vcl/debugevent.hxx> -#ifdef WNT +#ifdef _WIN32 #include <svsys.h> #include <process.h> #include <ole2.h> @@ -578,7 +578,7 @@ struct WorkerThreadData } }; -#ifdef WNT +#ifdef _WIN32 static HANDLE hThreadID = 0; static unsigned __stdcall _threadmain( void *pArgs ) { @@ -604,7 +604,7 @@ static void SAL_CALL MainWorkerFunction( void* pArgs ) void CreateMainLoopThread( oslWorkerFunction pWorker, void * pThreadData ) { -#ifdef WNT +#ifdef _WIN32 // sal thread always call CoInitializeEx, so a system dependent implementation is necessary unsigned uThreadID; @@ -624,7 +624,7 @@ void JoinMainLoopThread() { if( hThreadID ) { -#ifdef WNT +#ifdef _WIN32 WaitForSingleObject(hThreadID, INFINITE); #else osl_joinWithThread(hThreadID); |