diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-03-18 17:03:23 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-03-18 17:15:56 +0100 |
| commit | a09124e6f585a128b4f130804f4a1f1ee8a31c93 (patch) | |
| tree | 10fc0e44fa4750708932da53c5156cdd5fbd93b0 | |
| parent | 6104b4306dafa5315cf4a987b3b2f89f64de79f0 (diff) | |
avoid Wundef in cases where the usage seems otherwise ok
Change-Id: Iabccc31c59cec32235661f5225f45bb13f76a68f
| -rw-r--r-- | connectivity/source/drivers/mork/MNSFolders.cxx | 2 | ||||
| -rw-r--r-- | connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx | 2 | ||||
| -rw-r--r-- | oox/inc/oox/core/contexthandler.hxx | 2 | ||||
| -rw-r--r-- | pyuno/source/loader/pyuno_loader.cxx | 2 | ||||
| -rw-r--r-- | svl/source/numbers/zforlist.cxx | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/connectivity/source/drivers/mork/MNSFolders.cxx b/connectivity/source/drivers/mork/MNSFolders.cxx index ccebd62db0ea..561b1ce5afab 100644 --- a/connectivity/source/drivers/mork/MNSFolders.cxx +++ b/connectivity/source/drivers/mork/MNSFolders.cxx @@ -69,7 +69,7 @@ namespace { "Mozilla/SeaMonkey/", NULL, NULL, NULL }, { "Mozilla/Firefox/", NULL, NULL, NULL }, { "Thunderbird/", "Mozilla/Thunderbird/", NULL, NULL } - #elif(MACOSX) + #elif defined(MACOSX) { "../Mozilla/SeaMonkey/", NULL, NULL, NULL }, { "Firefox/", NULL, NULL, NULL }, { "../Thunderbird/", NULL, NULL, NULL } diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx index ccebd62db0ea..561b1ce5afab 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx @@ -69,7 +69,7 @@ namespace { "Mozilla/SeaMonkey/", NULL, NULL, NULL }, { "Mozilla/Firefox/", NULL, NULL, NULL }, { "Thunderbird/", "Mozilla/Thunderbird/", NULL, NULL } - #elif(MACOSX) + #elif defined(MACOSX) { "../Mozilla/SeaMonkey/", NULL, NULL, NULL }, { "Firefox/", NULL, NULL, NULL }, { "../Thunderbird/", NULL, NULL, NULL } diff --git a/oox/inc/oox/core/contexthandler.hxx b/oox/inc/oox/core/contexthandler.hxx index f9f6bb88906a..c6b3f06b763d 100644 --- a/oox/inc/oox/core/contexthandler.hxx +++ b/oox/inc/oox/core/contexthandler.hxx @@ -96,7 +96,7 @@ protected: void implSetLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& rxLocator ); -#if _MSC_VER +#ifdef _MSC_VER ContextHandler() {} // workaround #endif diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx index 329a1c7f4c35..3905360818ee 100644 --- a/pyuno/source/loader/pyuno_loader.cxx +++ b/pyuno/source/loader/pyuno_loader.cxx @@ -200,7 +200,7 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c if( !pythonPath.isEmpty() ) prependPythonPath( pythonPath ); -#if WNT +#ifdef WNT //extend PATH under windows to include the branddir/program so ssl libs will be found //for use by terminal mailmerge dependency _ssl.pyd rtl::OUString sEnvName(RTL_CONSTASCII_USTRINGPARAM("PATH")); diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 76f853cd3877..603e1a08036c 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -4477,9 +4477,9 @@ sal_Char NfCurrencyEntry::GetEuroSymbol( rtl_TextEncoding eTextEncoding ) case RTL_TEXTENCODING_APPLE_ROMAN : // MAC return '\xDB'; default: // default system -#if WNT +#if defined(WNT) return '\x80'; -#elif UNX +#elif defined(UNX) // return '\xA4'; // #56121# 0xA4 would be correct for iso-8859-15 return '\x80'; // but Windows code for the converted TrueType fonts #else |