diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-10-29 15:36:30 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-10-29 15:36:30 +0200 |
| commit | 91e34e4ccc6c61d0b64d250817af7f0d2263b89e (patch) | |
| tree | 40aada24b74a727c59941b29a8a12c3ea06f0b4f /rsc | |
| parent | CWS gnumake: resync to m91; conflicts unresolved (diff) | |
| download | core-91e34e4ccc6c61d0b64d250817af7f0d2263b89e.tar.gz core-91e34e4ccc6c61d0b64d250817af7f0d2263b89e.zip | |
CWS gnumake2: resolve conflicts and make sources buildable on Linux
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/source/parser/rscdb.cxx | 5 | ||||
| -rw-r--r-- | rsc/source/rsc/rsc.cxx | 12 |
2 files changed, 2 insertions, 15 deletions
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index a8a9bff6aee2..af176fe24934 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -126,11 +126,7 @@ static sal_uInt32 getLangIdAndShortenLocale( RscTypCont* pTypCont, else rLang = rtl::OString(); #if OSL_DEBUG_LEVEL > 1 -<<<<<<< local - fprintf( stderr, " %s (0x%" SAL_PRIxUINT32 ")", aL.getStr(), nRet ); -======= fprintf( stderr, " %s (0x%hx)", aL.getStr(), (int)nRet ); ->>>>>>> other #endif return nRet; } @@ -1117,3 +1113,4 @@ sal_uInt32 RscTypCont::PutTranslatorKey( sal_uInt64 nKey ) aIdTranslator[ nKey ] = nFilePos; return nPMId++; } + diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index 25677c982c23..54073563403d 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -474,23 +474,12 @@ ERRTYPE RscCompiler::Start() ByteString* pString; RscFile* pFName; -<<<<<<< local - if( PRINTSYNTAX_FLAG & pCL->nCommands ) - { -#ifndef W30 - pTC->WriteSyntax( stdout ); -printf( "khg\n" ); -#endif - return ERR_OK; - } -======= if( PRINTSYNTAX_FLAG & pCL->nCommands ) { pTC->WriteSyntax( stdout ); printf( "khg\n" ); return ERR_OK; } ->>>>>>> other // Kein Parameter, dann Hilfe pString = pCL->aInputList.First(); @@ -1378,3 +1367,4 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, if( pSysListFile ) fclose( pSysListFile ); } + |