diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-16 14:14:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-02-17 11:33:57 +0000 |
| commit | 2087484c65a3d5e75a9e8ad116d11a4e13366219 (patch) | |
| tree | 1f335918a854319df9269329d165a91d711d2108 /helpcompiler | |
| parent | d6bf086012343b4a1e27cd4242dced9ee0d73a06 (diff) | |
use consistent #define checks for the Windows platform
stage 2 of replacing usage of various checks for the windows platform
with the compiler-defined '_WIN32' macro
In this stage we focus on replacing usage of the WIN macro
Change-Id: Ie8a4a63198a6de96bd158ecd707dadafb9c8ea84
Reviewed-on: https://gerrit.libreoffice.org/22393
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'helpcompiler')
| -rw-r--r-- | helpcompiler/inc/HelpCompiler.hxx | 2 | ||||
| -rw-r--r-- | helpcompiler/source/HelpCompiler.cxx | 2 | ||||
| -rw-r--r-- | helpcompiler/source/HelpLinker.cxx | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/helpcompiler/inc/HelpCompiler.hxx b/helpcompiler/inc/HelpCompiler.hxx index b3e325165dbd..78f98a2821e1 100644 --- a/helpcompiler/inc/HelpCompiler.hxx +++ b/helpcompiler/inc/HelpCompiler.hxx @@ -87,7 +87,7 @@ namespace fs HCDBG(std::cerr << "native_file_string is " << tmp.getStr() << std::endl); return std::string(tmp.getStr()); } -#ifdef WNT +#ifdef _WIN32 wchar_t const * native_file_string_w() const { OUString ustrSystemPath; diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx index 276394a6e0aa..2a127fe2bb44 100644 --- a/helpcompiler/source/HelpCompiler.cxx +++ b/helpcompiler/source/HelpCompiler.cxx @@ -87,7 +87,7 @@ xmlDocPtr HelpCompiler::compactXhpForJar( xmlDocPtr doc ) void HelpCompiler::saveXhpForJar( xmlDocPtr doc, const fs::path &filePath ) { //save processed xhp document in ziptmp<module>_<lang>/text directory -#ifdef WNT +#ifdef _WIN32 std::string pathSep = "\\"; #else std::string pathSep = "/"; diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx index 626357dc5e70..95821f172a4b 100644 --- a/helpcompiler/source/HelpLinker.cxx +++ b/helpcompiler/source/HelpLinker.cxx @@ -87,7 +87,7 @@ void IndexerPreProcessor::processDocument if( pResNodeCaption ) { fs::path fsCaptionPureTextFile_docURL = m_fsCaptionFilesDirName / aStdStr_EncodedDocPathURL; -#ifdef WNT //We need _wfopen to support long file paths on Windows XP +#ifdef _WIN32 //We need _wfopen to support long file paths on Windows XP FILE* pFile_docURL = _wfopen( fsCaptionPureTextFile_docURL.native_file_string_w(), L"w" ); #else @@ -110,7 +110,7 @@ void IndexerPreProcessor::processDocument if( pResNodeContent ) { fs::path fsContentPureTextFile_docURL = m_fsContentFilesDirName / aStdStr_EncodedDocPathURL; -#ifdef WNT //We need _wfopen to support long file paths on Windows XP +#ifdef _WIN32 //We need _wfopen to support long file paths on Windows XP FILE* pFile_docURL = _wfopen( fsContentPureTextFile_docURL.native_file_string_w(), L"w" ); #else @@ -186,7 +186,7 @@ public: void dump_DBHelp( const fs::path& rFileName ) { -#ifdef WNT //We need _wfopen to support long file paths on Windows XP +#ifdef _WIN32 //We need _wfopen to support long file paths on Windows XP FILE* pFile = _wfopen( rFileName.native_file_string_w(), L"wb" ); #else FILE* pFile = fopen( rFileName.native_file_string().c_str(), "wb" ); @@ -303,7 +303,7 @@ void HelpLinker::link() throw(HelpProcessingException, BasicCodeTagger::TaggerEx bUse_ = false; fs::path helpTextFileName_DBHelp(indexDirParentName / (mod + (bUse_ ? ".ht_" : ".ht"))); -#ifdef WNT +#ifdef _WIN32 //We need _wfopen to support long file paths on Windows XP FILE* pFileHelpText_DBHelp = _wfopen ( helpTextFileName_DBHelp.native_file_string_w(), L"wb" ); @@ -314,7 +314,7 @@ void HelpLinker::link() throw(HelpProcessingException, BasicCodeTagger::TaggerEx #endif fs::path dbBaseFileName_DBHelp(indexDirParentName / (mod + (bUse_ ? ".db_" : ".db"))); -#ifdef WNT +#ifdef _WIN32 //We need _wfopen to support long file paths on Windows XP FILE* pFileDbBase_DBHelp = _wfopen ( dbBaseFileName_DBHelp.native_file_string_w(), L"wb" ); |