diff options
| -rw-r--r-- | include/osl/interlck.h | 4 | ||||
| -rw-r--r-- | include/sal/mathconf.h | 2 | ||||
| -rw-r--r-- | sw/qa/extras/odfexport/odfexport2.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/osl/interlck.h b/include/osl/interlck.h index 6264c595d0b2..f0a39e52c74e 100644 --- a/include/osl/interlck.h +++ b/include/osl/interlck.h @@ -70,7 +70,7 @@ SAL_DLLPUBLIC oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInte */ #if HAVE_GCC_BUILTIN_ATOMIC # define osl_atomic_increment(p) __sync_add_and_fetch((p), 1) -#elif defined WNT +#elif defined _WIN32 # define osl_atomic_increment(p) _InterlockedIncrement(p) #else # define osl_atomic_increment(p) osl_incrementInterlockedCount((p)) @@ -89,7 +89,7 @@ SAL_DLLPUBLIC oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInte */ #if HAVE_GCC_BUILTIN_ATOMIC # define osl_atomic_decrement(p) __sync_sub_and_fetch((p), 1) -#elif defined WNT +#elif defined _WIN32 # define osl_atomic_decrement(p) _InterlockedDecrement(p) #else # define osl_atomic_decrement(p) osl_decrementInterlockedCount((p)) diff --git a/include/sal/mathconf.h b/include/sal/mathconf.h index 3f8e98937d3c..ac824f1e486b 100644 --- a/include/sal/mathconf.h +++ b/include/sal/mathconf.h @@ -72,7 +72,7 @@ extern "C" { #define SAL_MATH_FINITE(d) std::isfinite(d) #elif defined __APPLE__ && !(defined __i386__ || defined __x86_64__) #define SAL_MATH_FINITE(d) isfinite(d) -#elif defined( WNT) +#elif defined(_WIN32) #define SAL_MATH_FINITE(d) _finite(d) #elif defined(ANDROID) || defined LINUX || defined UNX #define SAL_MATH_FINITE(d) finite(d) diff --git a/sw/qa/extras/odfexport/odfexport2.cxx b/sw/qa/extras/odfexport/odfexport2.cxx index 7d9d1a26169d..1c9d442e073b 100644 --- a/sw/qa/extras/odfexport/odfexport2.cxx +++ b/sw/qa/extras/odfexport/odfexport2.cxx @@ -999,7 +999,7 @@ DECLARE_ODFEXPORT_TEST(testTdf78510, "WordTest_edit.odt") // wonder how fragile this is... // FIXME some platform difference, 1st one is 2306 on Linux, 3087 on WNT ? // some Mac has 3110 -#if !defined(WNT) && !defined(MACOSX) +#if !defined(_WIN32) && !defined(MACOSX) { SwDocShell *const pShell(dynamic_cast<SwXTextDocument&>(*mxComponent).GetDocShell()); std::shared_ptr<GDIMetaFile> pMetaFile = pShell->GetPreviewMetaFile(); |