Skip to content

GCC15 compatibility issues #513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pgiffuni merged 3 commits into from
Oct 24, 2026
Merged

GCC15 compatibility issues #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e329348
Fix GCC 15 C++ standard library conflict with _CR/_LF macros
pgiffuni Oct 24, 2026
9104128
Fix K&R-style function declarations for GCC 15+ compatibility
pgiffuni Oct 23, 2026
72d1e63
Fix GCC 15 compatibility issues
pgiffuni Oct 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions main/l10ntools/source/cfglex.l
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,16 @@
/* external functions (C++ code, declared as extern "C" */
extern int WorkOnTokenSet( int, char* );
extern int InitCfgExport( char * , char *);
extern int EndCfgExport();
extern int GetError();
extern int SetError();
extern int EndCfgExport(void);
extern int GetError(void);
extern int SetError(void);
extern char *GetOutputFile( int argc, char* argv[]);
extern FILE *GetCfgFile();
extern int isQuiet();
extern void removeTempFile();
extern char* getFilename();
extern FILE *GetCfgFile(void);
extern int isQuiet(void);
extern void removeTempFile(void);
extern char* getFilename(void);
/* forwards */
void YYWarning();
void YYWarning(char *);

int bText=0;
%}
Expand Down
16 changes: 8 additions & 8 deletions main/l10ntools/source/srclex.l
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,17 @@
extern int WorkOnTokenSet( int, char* );
extern int InitExport( char * , char * );
extern int Parse( int nTyp, char *pTokenText );
extern int EndExport();
extern int SetError();
extern int GetError();
extern int EndExport(void);
extern int SetError(void);
extern int GetError(void);
extern char *GetOutputFile( int argc, char* argv[]);
extern FILE *GetNextFile();
extern int isQuiet();
extern void Close();
extern char* getFilename();
extern FILE *GetNextFile(void);
extern int isQuiet(void);
extern void Close(void);
extern char *getFilename(void);

/* forwards */
void YYWarning();
void YYWarning(char *);
%}

%p 24000
Expand Down
16 changes: 8 additions & 8 deletions main/l10ntools/source/xrmlex.l
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,17 @@
extern int WorkOnTokenSet( int, char* );
extern int Argument( char * );
extern int InitXrmExport( char * , char * );
extern int EndXrmExport();
extern int GetError();
extern int SetError();
extern int EndXrmExport(void);
extern int GetError(void);
extern int SetError(void);
extern char *GetOutputFile( int argc, char* argv[]);
extern FILE *GetXrmFile();
extern int isQuiet();
extern void removeTempFile();
extern char* getFilename();
extern FILE *GetXrmFile(void);
extern int isQuiet(void);
extern void removeTempFile(void);
extern char* getFilename(void);

/* forwards */
void YYWarning();
void YYWarning(char *);

int bText=0;
%}
Expand Down
2 changes: 1 addition & 1 deletion main/l10ntools/source/xrmmerge.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ void XRMResParser::ConvertStringToDBFormat( ByteString &rString )
ByteString sResult;
do {
sResult = rString;
rString.EraseLeadingChars( _LF );
rString.EraseLeadingChars( SAL_LF );
// rString.EraseLeadingChars( ' ' );
rString.EraseLeadingChars( '\t' );
// rString.EraseTrailingChars( ' ' );
Expand Down
6 changes: 2 additions & 4 deletions main/rsc/source/rscpp/cpp3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ void setincdirs()
#endif

#if HOST == SYS_VMS
extern char *getenv();
// getenv declared in stdlib.h

if (getenv("C$LIBRARY") != NULL)
*incend++ = "C$LIBRARY:";
Expand Down Expand Up @@ -460,9 +460,7 @@ void initdefines()
int i;
time_t tvec;

#if !defined( ZTC ) && !defined( WNT ) && !defined(BLC) && !defined(G3)
extern char *ctime();
#endif
// ctime declared in time.h

/*
* Predefine the built-in symbols. Allow the
Expand Down
4 changes: 2 additions & 2 deletions main/rsc/source/rscpp/cpp4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ void expand(DEFBUF* tokenp)
register int c;
register FILEINFO *file;
#ifndef ZTC /* BP */
extern FILEINFO *getfile();
extern FILEINFO *getfile(int bufsize, char *name);
#endif

#if OSL_DEBUG_LEVEL > 1
Expand Down Expand Up @@ -559,7 +559,7 @@ void expstuff(DEFBUF* tokenp)
int string_magic; /* String formal hack */
FILEINFO *file; /* Funny #include */
#ifndef ZTC /* BP */
extern FILEINFO *getfile();
extern FILEINFO *getfile(int bufsize, char *name);
#endif

file = getfile(NBUFF, tokenp->name);
Expand Down
2 changes: 1 addition & 1 deletion main/rsc/source/rscpp/cpp5.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ eval()
int value[NEXP]; /* Value stack */
OPTAB opstack[NEXP]; /* Operand stack */
#ifndef ZTC /* BP */
extern int *evaleval(); /* Does actual evaluation */
extern int *evaleval(int *, int, int); /* Does actual evaluation */
#endif
valp = value;
opp = opstack;
Expand Down
2 changes: 1 addition & 1 deletion main/rsc/source/rscpp/cpp6.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,7 @@ void ungetstring(char* text)
{
register FILEINFO *file;
#ifndef ZTC /* BP */
extern FILEINFO *getfile();
extern FILEINFO *getfile(int bufsize, char *name);
#endif
file = getfile(strlen(text) + 1, "");
strcpy(file->buffer, text);
Expand Down
2 changes: 1 addition & 1 deletion main/sc/inc/formularesult.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ inline bool ScFormulaResult::IsMultiline() const
if (meMultiline == MULTILINE_UNKNOWN)
{
const String& rStr = GetString();
if (rStr.Len() && rStr.Search( _LF ) != STRING_NOTFOUND)
if (rStr.Len() && rStr.Search( SAL_LF ) != STRING_NOTFOUND)
const_cast<ScFormulaResult*>(this)->meMultiline = MULTILINE_TRUE;
else
const_cast<ScFormulaResult*>(this)->meMultiline = MULTILINE_FALSE;
Expand Down
4 changes: 2 additions & 2 deletions main/sc/source/filter/html/htmlexp.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1122,7 +1122,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
}
else
{
xub_StrLen nPos = aStrOut.Search( _LF );
xub_StrLen nPos = aStrOut.Search( SAL_LF );
if ( nPos == STRING_NOTFOUND )
{
OUT_STR( aStrOut );
Expand All @@ -1137,7 +1137,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak );
nStartPos = nPos + 1;
}
while( ( nPos = aStrOut.Search( _LF, nStartPos ) ) != STRING_NOTFOUND );
while( ( nPos = aStrOut.Search( SAL_LF, nStartPos ) ) != STRING_NOTFOUND );
String aSingleLine( aStrOut, nStartPos, aStrOut.Len() - nStartPos );
OUT_STR( aSingleLine );
}
Expand Down
6 changes: 3 additions & 3 deletions main/sc/source/ui/docshell/docsh.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1960,7 +1960,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
bool bNeedQuotes = rAsciiOpt.bQuoteAllText ||
( nPos != STRING_NOTFOUND ) ||
( aString.Search( cDelim ) != STRING_NOTFOUND ) ||
( aString.Search( sal_Unicode(_LF) ) != STRING_NOTFOUND );
( aString.Search( sal_Unicode(SAL_LF) ) != STRING_NOTFOUND );
while ( nPos != STRING_NOTFOUND )
{
aString.Insert( cStrDelim, nPos );
Expand Down Expand Up @@ -1999,7 +1999,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
bool bNeedQuotes = rAsciiOpt.bQuoteAllText ||
( nPos != STRING_NOTFOUND ) ||
( aStrDec.Search( aDelimDecoded ) != STRING_NOTFOUND ) ||
( aStrDec.Search( sal_Unicode(_LF) ) != STRING_NOTFOUND );
( aStrDec.Search( sal_Unicode(SAL_LF) ) != STRING_NOTFOUND );
while ( nPos != STRING_NOTFOUND )
{
aStrDec.Insert( aStrDelimDecoded, nPos );
Expand All @@ -2021,7 +2021,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
bool bNeedQuotes = rAsciiOpt.bQuoteAllText ||
( nPos != STRING_NOTFOUND ) ||
( aStrEnc.Search( aDelimEncoded ) != STRING_NOTFOUND ) ||
( aStrEnc.Search( sal_Char(_LF) ) != STRING_NOTFOUND );
( aStrEnc.Search( sal_Char(SAL_LF) ) != STRING_NOTFOUND );
while ( nPos != STRING_NOTFOUND )
{
aStrEnc.Insert( aStrDelimEncoded, nPos );
Expand Down
20 changes: 10 additions & 10 deletions main/sc/source/ui/docshell/impex.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,13 +592,13 @@ void ScImportExport::WriteUnicodeOrByteEndl( SvStream& rStrm )
switch ( rStrm.GetLineDelimiter() )
{
case LINEEND_CR :
rStrm << sal_Unicode(_CR);
rStrm << sal_Unicode(SAL_CR);
break;
case LINEEND_LF :
rStrm << sal_Unicode(_LF);
rStrm << sal_Unicode(SAL_LF);
break;
default:
rStrm << sal_Unicode(_CR) << sal_Unicode(_LF);
rStrm << sal_Unicode(SAL_CR) << sal_Unicode(SAL_LF);
}
}
else
Expand Down Expand Up @@ -672,7 +672,7 @@ void lcl_UnescapeSylk( String & rString, SylkVersion eVersion )
else
rString.SearchAndReplaceAll( DOUBLE_DOUBLEQUOTE, '"' );

rString.SearchAndReplaceAll( SYLK_LF, _LF );
rString.SearchAndReplaceAll( SYLK_LF, SAL_LF );
}

static const sal_Unicode* lcl_ScanSylkString( const sal_Unicode* p,
Expand Down Expand Up @@ -1117,7 +1117,7 @@ static bool lcl_PutString(
}

// Standard or date not determined -> SetString / EditCell
if( rStr.Search( _LF ) == STRING_NOTFOUND )
if( rStr.Search( SAL_LF ) == STRING_NOTFOUND )
pDoc->SetString( nCol, nRow, nTab, rStr, pFormatter, bDetectNumFormat );
else
{
Expand Down Expand Up @@ -1454,11 +1454,11 @@ sal_Bool ScImportExport::Doc2Text( SvStream& rStrm )
{
pDoc->GetString( nCol, nRow, aRange.aStart.Tab(), aCell );

bool bMultiLineText = ( aCell.Search( _LF ) != STRING_NOTFOUND );
bool bMultiLineText = ( aCell.Search( SAL_LF ) != STRING_NOTFOUND );
if( bMultiLineText )
{
if( mExportTextOptions.meNewlineConversion == ScExportTextOptions::ToSpace )
aCell.SearchAndReplaceAll( _LF, ' ' );
aCell.SearchAndReplaceAll( SAL_LF, ' ' );
else if ( mExportTextOptions.meNewlineConversion == ScExportTextOptions::ToSystem && bConvertLF )
aCell.ConvertLineEnd();
}
Expand Down Expand Up @@ -1486,11 +1486,11 @@ sal_Bool ScImportExport::Doc2Text( SvStream& rStrm )
{
pDoc->GetString( nCol, nRow, aRange.aStart.Tab(), aCell );

bool bMultiLineText = ( aCell.Search( _LF ) != STRING_NOTFOUND );
bool bMultiLineText = ( aCell.Search( SAL_LF ) != STRING_NOTFOUND );
if( bMultiLineText )
{
if( mExportTextOptions.meNewlineConversion == ScExportTextOptions::ToSpace )
aCell.SearchAndReplaceAll( _LF, ' ' );
aCell.SearchAndReplaceAll( SAL_LF, ' ' );
else if ( mExportTextOptions.meNewlineConversion == ScExportTextOptions::ToSystem && bConvertLF )
aCell.ConvertLineEnd();
}
Expand Down Expand Up @@ -1838,7 +1838,7 @@ sal_Bool ScImportExport::Doc2Sylk( SvStream& rStrm )
case CELLTYPE_EDIT:
hasstring:
pDoc->GetString( nCol, nRow, aRange.aStart.Tab(), aCellStr );
aCellStr.SearchAndReplaceAll( _LF, SYLK_LF );
aCellStr.SearchAndReplaceAll( SAL_LF, SYLK_LF );

aBufStr.AssignAscii(RTL_CONSTASCII_STRINGPARAM( "C;X" ));
aBufStr += String::CreateFromInt32( c );
Expand Down
2 changes: 1 addition & 1 deletion main/soltools/checkdll/checkdll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ int main(int argc, char *argv[])
if (!silent) printf("Checking DLL %s ...", argv[1]);
fflush(stdout);

if ( (phandle = dlopen(argv[1], RTLD_NOW)) != NULL ) {
if ( (phandle = dlopen(argv[1], RTLD_LAZY)) != NULL ) {
if ( (pfun = (char *(*)(void))dlsym(phandle, psymbol)) != NULL ) {
if (!silent) printf(": ok\n");
}
Expand Down
18 changes: 9 additions & 9 deletions main/soltools/mkdepend/def.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,17 +150,17 @@ struct filepointer {
char *malloc(), *realloc();
#endif /* macII */
#else
char *malloc();
char *realloc();
char *malloc(size_t);
char *realloc(void *, size_t);
#endif

char *copy();
char *base_name();
char *get_line();
char *isdefined();
struct filepointer *getfile();
struct inclist *newinclude();
struct inclist *inc_path();
char *copy(char *);
char *base_name(char *);
char *get_line(struct filepointer *);
char *isdefined(char *);
struct filepointer *getfile(char *);
struct inclist *newinclude(char *, char *);
struct inclist *inc_path(char *, char *, boolean, struct IncludesCollection*);

void define( char *def, struct symhash **symbols );
void hash_define(char *name, char * val, struct symhash **symbols);
Expand Down
9 changes: 4 additions & 5 deletions main/soltools/mkdepend/ifparser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,11 @@ typedef int Bool;

typedef struct _if_parser {
struct { /* functions */
const char *(*handle_error) (/* struct _if_parser *, const char *,
const char * */);
int (*eval_variable) (/* struct _if_parser *, const char *, int */);
int (*eval_defined) (/* struct _if_parser *, const char *, int */);
const char *(*handle_error)(struct _if_parser *, const char *, const char *);
int (*eval_variable) (struct _if_parser *, const char *, int);
int (*eval_defined) (struct _if_parser *, const char *, int);
} funcs;
char *data;
} IfParser;

const char *ParseIfExpression (/* IfParser *, const char *, int * */);
const char *ParseIfExpression(IfParser *, const char *, int *);
2 changes: 1 addition & 1 deletion main/svl/source/items/slstitm.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ void SfxStringListItem::SetString( const XubString& rStr )
aStr.ConvertLineEnd(LINEEND_CR);
do
{
nDelimPos = aStr.Search( _CR, nStart );
nDelimPos = aStr.Search( SAL_CR, nStart );
xub_StrLen nLen;
if ( nDelimPos == STRING_NOTFOUND )
nLen = 0xffff;
Expand Down
6 changes: 3 additions & 3 deletions main/svtools/source/contnr/svimpicn.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ long GetTextLines( OutputDevice* pDev, MultiTextLineInfo& rLineInfo,
c = pStr[i];

// Auf Zeilenende ermitteln
if ( (c == _CR) || (c == _LF) )
if ( (c == SAL_CR) || (c == SAL_LF) )
bHardBreak = sal_True;
else
bHardBreak = sal_False;
Expand Down Expand Up @@ -296,7 +296,7 @@ long GetTextLines( OutputDevice* pDev, MultiTextLineInfo& rLineInfo,
{
nStartPos++;
c2 = pStr[i+1];
if ( (c != c2) && ((c2 == _CR) || (c2 == _LF)) )
if ( (c != c2) && ((c2 == SAL_CR) || (c2 == SAL_LF)) )
{
nStartPos++;
i++;
Expand Down Expand Up @@ -499,7 +499,7 @@ void DrawText( OutputDevice* pDev, const Rectangle& rRect,
pLineInfo = aMultiLineInfo.GetLine( nFormatLines );
aLastLine = rStr.Copy( pLineInfo->GetIndex() );
aLastLine.ConvertLineEnd( LINEEND_LF );
aLastLine.SearchAndReplace( _LF, ' ' );
aLastLine.SearchAndReplace( SAL_LF, ' ' );
aLastLine = GetEllipsisString( pDev, aLastLine, nWidth, nStyle );
nStyle &= ~(TEXT_DRAW_VCENTER | TEXT_DRAW_BOTTOM);
nStyle |= TEXT_DRAW_TOP;
Expand Down
4 changes: 2 additions & 2 deletions main/svtools/source/svhtml/parhtml.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2175,8 +2175,8 @@ bool HTMLParser::ParseMetaOptionsImpl(
if ( bHTTPEquiv || HTML_META_DESCRIPTION != nAction )
{
// if it is not a Description, remove CRs and LFs from CONTENT
aContent.EraseAllChars( _CR );
aContent.EraseAllChars( _LF );
aContent.EraseAllChars( SAL_CR );
aContent.EraseAllChars( SAL_LF );
}
else
{
Expand Down
4 changes: 2 additions & 2 deletions main/sw/source/filter/html/htmlform.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1688,8 +1688,8 @@ void SwHTMLParser::InsertInput()
// geloescht werden.
if( !bKeepCRLFInValue )
{
sText.EraseAllChars( _CR );
sText.EraseAllChars( _LF );
sText.EraseAllChars( SAL_CR );
sText.EraseAllChars( SAL_LF );
}

const uno::Reference< XMultiServiceFactory > & rServiceFactory =
Expand Down
4 changes: 2 additions & 2 deletions main/sw/source/filter/html/swhtml.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5339,8 +5339,8 @@ void SwHTMLParser::ParseMoreMetaOptions()
aName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_META_content_script_type ) )
return;

aContent.EraseAllChars( _CR );
aContent.EraseAllChars( _LF );
aContent.EraseAllChars( SAL_CR );
aContent.EraseAllChars( SAL_LF );

if( aName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_META_sdendnote ) )
{
Expand Down
Loading