From ce43d0ae9279edbf1ad108fe0d8325327a038d49 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 16 Feb 2016 11:26:51 +0200 Subject: use consistent #define checks for the Windows platform stage 1 of replacing usage of various checks for the windows platform with the compiler-defined '_WIN32' macro Change-Id: Iece73abdee530937e0737190b1aa97a46cd3075f Reviewed-on: https://gerrit.libreoffice.org/22390 Tested-by: Jenkins Reviewed-by: Michael Stahl --- onlineupdate/source/libmar/inc/mozilla/Assertions.h | 2 +- onlineupdate/source/libmar/inc/mozilla/Types.h | 2 +- onlineupdate/source/update/inc/mozilla/Assertions.h | 2 +- onlineupdate/source/update/inc/mozilla/Types.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'onlineupdate') diff --git a/onlineupdate/source/libmar/inc/mozilla/Assertions.h b/onlineupdate/source/libmar/inc/mozilla/Assertions.h index c72e020806cd..5669091bbb8e 100644 --- a/onlineupdate/source/libmar/inc/mozilla/Assertions.h +++ b/onlineupdate/source/libmar/inc/mozilla/Assertions.h @@ -24,7 +24,7 @@ #include #include #include -#ifdef WIN32 +#ifdef _WIN32 /* * TerminateProcess and GetCurrentProcess are defined in , which * further depends on . We hardcode these few definitions manually diff --git a/onlineupdate/source/libmar/inc/mozilla/Types.h b/onlineupdate/source/libmar/inc/mozilla/Types.h index a5d936389d99..9d1e34b6d1d6 100644 --- a/onlineupdate/source/libmar/inc/mozilla/Types.h +++ b/onlineupdate/source/libmar/inc/mozilla/Types.h @@ -37,7 +37,7 @@ * These macros are designed for use by library interfaces -- not for normal * methods or data used cross-file. */ -#if defined(WIN32) +#if defined(_WIN32) # define MOZ_EXPORT __declspec(dllexport) #else /* Unix */ # ifdef HAVE_VISIBILITY_ATTRIBUTE diff --git a/onlineupdate/source/update/inc/mozilla/Assertions.h b/onlineupdate/source/update/inc/mozilla/Assertions.h index c72e020806cd..5669091bbb8e 100644 --- a/onlineupdate/source/update/inc/mozilla/Assertions.h +++ b/onlineupdate/source/update/inc/mozilla/Assertions.h @@ -24,7 +24,7 @@ #include #include #include -#ifdef WIN32 +#ifdef _WIN32 /* * TerminateProcess and GetCurrentProcess are defined in , which * further depends on . We hardcode these few definitions manually diff --git a/onlineupdate/source/update/inc/mozilla/Types.h b/onlineupdate/source/update/inc/mozilla/Types.h index a5d936389d99..9d1e34b6d1d6 100644 --- a/onlineupdate/source/update/inc/mozilla/Types.h +++ b/onlineupdate/source/update/inc/mozilla/Types.h @@ -37,7 +37,7 @@ * These macros are designed for use by library interfaces -- not for normal * methods or data used cross-file. */ -#if defined(WIN32) +#if defined(_WIN32) # define MOZ_EXPORT __declspec(dllexport) #else /* Unix */ # ifdef HAVE_VISIBILITY_ATTRIBUTE -- cgit '>distro/collabora/cp-4.1 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-04-05Use std algorithms hereMike Kaganski
2019-05-28tdf#42949 Fix IWYU warnings in i18npool/Gabor Kelemen
2018-02-01i18npool: MSVC: pragma warning: make more specific, remove obsoleteMike Kaganski
2018-01-15convert a<b?a:b to std::min(a,b)Noel Grandin
2018-01-12More loplugin:cstylecast: i18npoolStephan Bergmann
2018-01-11convert (a>b?a:b) to std::max(a,b)Noel Grandin
2017-01-17replace #ifdef SOLARIS with #ifdef __sunMichael Stahl
2016-01-11loplugin:unusedmethods unused return value in i18npoolNoel Grandin
2016-01-10Fix typosAndrea Gelmini
2015-09-30Fix typosAndrea Gelmini
2015-02-23remove unnecessary parenthesis in return statementsNoel Grandin
2015-02-11typos and nitpicksEike Rathke
2014-12-18fdo#39440 reduce scope of local variablesMichael Weghorn
2014-11-12Fix common typos. No automatic tools. Handmade…Andrea Gelmini