diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-11-28 00:31:48 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-05-19 03:43:26 +0200 |
| commit | 19fec985e98707cebf11c3fce2531df1c2a666dd (patch) | |
| tree | 2b4a709d41be83e3bd60600734b75094794c22fe | |
| parent | fix Wundef warnings (diff) | |
| download | core-19fec985e98707cebf11c3fce2531df1c2a666dd.tar.gz core-19fec985e98707cebf11c3fce2531df1c2a666dd.zip | |
fix more platform define checks
Change-Id: I2e125770fc6c21141c45ccc057d95fada8ccf74c
| -rw-r--r-- | desktop/source/app/updater.cxx | 4 | ||||
| -rw-r--r-- | onlineupdate/source/libmar/verify/cryptox.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx index 183ad8d9c8ae..0ca03bc9de9e 100644 --- a/desktop/source/app/updater.cxx +++ b/desktop/source/app/updater.cxx @@ -40,9 +40,9 @@ class error_updater : public std::exception static const char kUserAgent[] = "UpdateChecker/1.0 (Linux)"; -#if UNX +#ifdef UNX const char* pUpdaterName = "updater"; -#elif WNT +#elif defined(WNT) const char* pUpdaterName = "updater.exe"; #else #error "Need implementation" diff --git a/onlineupdate/source/libmar/verify/cryptox.c b/onlineupdate/source/libmar/verify/cryptox.c index f71c4cef1b06..7edf8bea233d 100644 --- a/onlineupdate/source/libmar/verify/cryptox.c +++ b/onlineupdate/source/libmar/verify/cryptox.c @@ -13,8 +13,10 @@ #if defined(MAR_NSS) +#ifdef _WIN32 #pragma warning(push) #pragma warning(disable: 4204) +#endif /** * Loads the public key for the specified cert name from the NSS store. @@ -270,7 +272,9 @@ CryptoAPI_VerifyUpdate(HCRYPTHASH* hash, BYTE *buf, DWORD len) return result ? CryptoX_Success : CryptoX_Error; } +#ifdef _WIN32 #pragma warning(pop) +#endif #endif |