From fa7856a556a19df6309049d8dc2636a08021f73c Mon Sep 17 00:00:00 2001 From: Jiri Malak Date: Fri, 8 Nov 2024 09:48:29 +0100 Subject: [PATCH] cc: cleanup code remove useless macros rename symbols to be more transparent --- bld/cc/c/cdecl1.c | 2 +- bld/cc/c/cdinit.c | 8 ++++---- bld/cc/c/cenum.c | 2 +- bld/cc/c/cexpr.c | 4 ++-- bld/cc/c/cmac1.c | 2 +- bld/cc/c/cmac2.c | 3 ++- bld/cc/c/cmodel.c | 4 ++-- bld/cc/c/coptions.c | 2 +- bld/cc/c/cscan.c | 7 ++++--- bld/cc/c/cstmt.c | 18 +++++++++--------- bld/cc/c/csym.c | 6 +++--- bld/cc/c/ctype.c | 6 ++++-- bld/cc/c/ppexpn.c | 40 ++++++++++++++++++++-------------------- bld/cc/h/cconst.h | 2 +- bld/cc/h/ctypes.h | 5 +---- bld/cc/h/cvars.h | 2 +- 16 files changed, 57 insertions(+), 56 deletions(-) diff --git a/bld/cc/c/cdecl1.c b/bld/cc/c/cdecl1.c index 7e71b8f8e4..96a27f6ae0 100644 --- a/bld/cc/c/cdecl1.c +++ b/bld/cc/c/cdecl1.c @@ -584,7 +584,7 @@ static void CheckParms( void ) if( VarParm( CurFunc ) ) { typ = ArrayNode( GetType( TYP_CHAR ) ); typ->u.array->dimension = 160; - sym_handle = GetNewSym( &var_parm, 'V', typ, SC_AUTO ); + sym_handle = GetNewDotSym( &var_parm, 'V', typ, SC_AUTO ); SymReplace( &var_parm, sym_handle ); prev_parm->sym.handle = sym_handle; } diff --git a/bld/cc/c/cdinit.c b/bld/cc/c/cdinit.c index 6ffe34b957..8a6afa2a9a 100644 --- a/bld/cc/c/cdinit.c +++ b/bld/cc/c/cdinit.c @@ -720,7 +720,7 @@ static void *DesignatedInit( TYPEPTR typ, TYPEPTR ctyp, void *field ) static bool new_field = true; if( !CompFlags.extensions_enabled - && CHECK_STD( < , C99 ) ) { + && ( CompVars.cstd < STD_C99 ) ) { return( field ); } @@ -1339,7 +1339,7 @@ static void AggregateVarDeclEquals( SYMPTR sym, SYM_HANDLE sym_handle ) SYM_HANDLE sym2_handle; SYM_ENTRY sym2; - sym2_handle = MakeNewSym( &sym2, 'X', sym->sym_type, SC_STATIC ); + sym2_handle = MakeNewDotSym( &sym2, 'X', sym->sym_type, SC_STATIC ); sym2.flags |= SYM_INITIALIZED; CompFlags.initializing_data = true; StaticInit( &sym2, sym2_handle ); @@ -1525,7 +1525,7 @@ static void InitArrayVar( SYMPTR sym, SYM_HANDLE sym_handle, TYPEPTR typ ) */ NextToken(); if( CharArray( typ->object ) ) { - sym2_handle = MakeNewSym( &sym2, 'X', typ, SC_STATIC ); + sym2_handle = MakeNewDotSym( &sym2, 'X', typ, SC_STATIC ); sym2.flags |= SYM_INITIALIZED; if( sym2.u.var.segid == SEG_NULL ) { SetFarHuge( &sym2, false ); @@ -1538,7 +1538,7 @@ static void InitArrayVar( SYMPTR sym, SYM_HANDLE sym_handle, TYPEPTR typ ) AssignAggregate( VarLeaf( sym, sym_handle ), VarLeaf( &sym2, sym2_handle ), typ ); } else if( WCharArray( typ->object ) ) { - sym2_handle = MakeNewSym( &sym2, 'X', typ, SC_STATIC ); + sym2_handle = MakeNewDotSym( &sym2, 'X', typ, SC_STATIC ); sym2.flags |= SYM_INITIALIZED; if( sym2.u.var.segid == SEG_NULL ) { SetFarHuge( &sym2, false ); diff --git a/bld/cc/c/cenum.c b/bld/cc/c/cenum.c index 58709ebf48..78b4cd6f82 100644 --- a/bld/cc/c/cenum.c +++ b/bld/cc/c/cenum.c @@ -314,7 +314,7 @@ TYPEPTR EnumDecl( type_modifiers flags ) U64Add( &n, &Inc, &n ); MustRecog( T_COMMA ); if( !CompFlags.extensions_enabled - && CHECK_STD( < , C99 ) + && ( CompVars.cstd < STD_C99 ) && ( CurToken == T_RIGHT_BRACE )) { ExpectIdentifier(); } diff --git a/bld/cc/c/cexpr.c b/bld/cc/c/cexpr.c index 58d80ff29b..6214190528 100644 --- a/bld/cc/c/cexpr.c +++ b/bld/cc/c/cexpr.c @@ -2358,7 +2358,7 @@ static TREEPTR DummyFuncName( void ) SYM_ENTRY sym; typ = FuncNode( GetType( TYP_INT ), FLAG_NONE, NULL ); - sym_handle = MakeNewSym( &sym, 'F', typ, SC_AUTO ); + sym_handle = MakeNewDotSym( &sym, 'F', typ, SC_AUTO ); sym.flags |= SYM_FUNCTION; sym.mods = FLAG_NONE; SymReplace( &sym, sym_handle ); @@ -2415,7 +2415,7 @@ static TREEPTR StartFunc( TREEPTR tree, TYPEPTR **plistptr ) if( tree->op.opr == OPR_POINTS ) { /* need to recover decl flags */ decl_flags = typ->u.fn.decl_flags; } - sym_handle = MakeNewSym( &sym, 'F', orig_typ, SC_AUTO ); + sym_handle = MakeNewDotSym( &sym, 'F', orig_typ, SC_AUTO ); sym.flags |= SYM_FUNCTION; sym.mods = decl_flags; SymReplace( &sym, sym_handle ); diff --git a/bld/cc/c/cmac1.c b/bld/cc/c/cmac1.c index 51d8b5d7b4..cbc5006021 100644 --- a/bld/cc/c/cmac1.c +++ b/bld/cc/c/cmac1.c @@ -422,7 +422,7 @@ TOKEN SpecialMacro( MEPTR mentry ) ConstType = TYP_INT; return( T_CONSTANT ); case MACRO_STDC_VERSION: - if( CHECK_STD( < , C99 ) ) { + if( CompVars.cstd < STD_C99 ) { WriteBufferString( "199409L" ); Constant = 199409; } else { diff --git a/bld/cc/c/cmac2.c b/bld/cc/c/cmac2.c index b8d9a90e24..c7b5a1fc2a 100644 --- a/bld/cc/c/cmac2.c +++ b/bld/cc/c/cmac2.c @@ -834,7 +834,8 @@ static void CError( void ) static void CWarning( void ) { - if( CompFlags.extensions_enabled || CHECK_STD( >= , C23 ) ) { + if( CompFlags.extensions_enabled + || ( CompVars.cstd >= STD_C23 ) ) { get_arg_message(); /* * Force #error output to be reported, even with preprocessor diff --git a/bld/cc/c/cmodel.c b/bld/cc/c/cmodel.c index a568e9f957..94b6087792 100644 --- a/bld/cc/c/cmodel.c +++ b/bld/cc/c/cmodel.c @@ -2,7 +2,7 @@ * * Open Watcom Project * -* Copyright (c) 2002-2023 The Open Watcom Contributors. All Rights Reserved. +* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved. * Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved. * * ======================================================================== @@ -292,7 +292,7 @@ void InitModInfo( void ) WngLevel = WLEVEL_DEFAULT; PreProcChar = '#'; - SET_STD( C89 ); + CompVars.cstd = STD_C89; CompFlags.check_syntax = false; CompFlags.signed_char = false; diff --git a/bld/cc/c/coptions.c b/bld/cc/c/coptions.c index 6f3590b5a3..4c4fd6ce55 100644 --- a/bld/cc/c/coptions.c +++ b/bld/cc/c/coptions.c @@ -453,7 +453,7 @@ static void AnalyseAnyTargetOptions( OPT_STORAGE *data ) } switch( data->cstd ) { case OPT_ENUM_cstd_za99: - SET_STD( C99 ); + CompVars.cstd = STD_C99; break; case OPT_ENUM_cstd_zastd: if( data->zastd_value != STD_NONE ) diff --git a/bld/cc/c/cscan.c b/bld/cc/c/cscan.c index 00f4c77297..20e4f21bf6 100644 --- a/bld/cc/c/cscan.c +++ b/bld/cc/c/cscan.c @@ -210,7 +210,7 @@ TOKEN KwLookup( const char *buf, size_t len ) /* * look up id in keyword table */ - if( CHECK_STD( < , C99 ) ) { + if( CompVars.cstd < STD_C99 ) { switch( token ) { case T__BOOL: case T_INLINE: @@ -460,7 +460,8 @@ static TOKEN doScanPPNumber( void ) || c == '.' ) { WriteBufferChar( c ); } else if( ( prevc == 'e' || prevc == 'E' - || CHECK_STD( > , C89 ) && ( prevc == 'p' || prevc == 'P' ) ) + || ( CompVars.cstd > STD_C89 ) + && ( prevc == 'p' || prevc == 'P' ) ) && ( c == '+' || c == '-' ) ) { WriteBufferChar( c ); if( CompFlags.extensions_enabled ) { @@ -678,7 +679,7 @@ static TOKEN doScanNum( void ) c = WriteBufferCharNextChar( c ); } - if( CHECK_STD( > , C89 ) ) { + if( CompVars.cstd > STD_C89 ) { if( c == '.' || c == 'p' || c == 'P' ) { diff --git a/bld/cc/c/cstmt.c b/bld/cc/c/cstmt.c index bb174f6640..374b169c9e 100644 --- a/bld/cc/c/cstmt.c +++ b/bld/cc/c/cstmt.c @@ -461,7 +461,7 @@ static SYM_HANDLE GetLocalVarDecls( void ) if( symlist != SYM_NULL ) { symhandle = CurFunc->u.func.locals; /* - * symhandle will be non-zero if MakeNewSym was called while + * symhandle will be non-zero if MakeNewDotSym was called while * parsing the declaration list. */ if( symhandle != SYM_NULL ) { // if some temporaries were created @@ -703,11 +703,11 @@ static void ForStmt( void ) NextToken(); MustRecog( T_LEFT_PAREN ); - if( CHECK_STD( > , C89 ) ) { + if( CompVars.cstd > STD_C99 ) { PushBlock(); // 'for' opens new scope } if( CurToken != T_SEMI_COLON ) { - if( CHECK_STD( > , C89 ) ) { + if( CompVars.cstd > STD_C89 ) { TREEPTR tree; tree = LeafNode( OPR_NEWBLOCK ); @@ -897,7 +897,7 @@ static SYM_HANDLE DummyTrySymbol( void ) SYM_ENTRY sym; SYM_HANDLE sym_handle; - sym_handle = MakeNewSym( &sym, 'T', GetType( TYP_VOID ), SC_STATIC ); + sym_handle = MakeNewDotSym( &sym, 'T', GetType( TYP_VOID ), SC_STATIC ); SymReplace( &sym, sym_handle ); return( sym_handle ); } @@ -1092,7 +1092,7 @@ static void EndOfStmt( void ) EndForStmt(); --LoopDepth; DropBreakLabel(); - if( CHECK_STD( > , C89 ) ) { + if( CompVars.cstd > STD_C89 ) { EndBlock(); /* Terminate the scope introduced by 'for' */ PopBlock(); } @@ -1252,7 +1252,7 @@ void Statement( void ) if( GrabLabels() == 0 ) { GetLocalVarDecls(); } - func_result_handle = MakeNewSym( &sym, 'R', CurFunc->sym_type->object, SC_AUTO ); + func_result_handle = MakeNewDotSym( &sym, 'R', CurFunc->sym_type->object, SC_AUTO ); sym.flags |= SYM_FUNC_RETURN_VAR; SymReplace( &sym, func_result_handle ); for( ;; ) { @@ -1260,7 +1260,7 @@ void Statement( void ) if( GrabLabels() == 0 && declaration_allowed && IsDeclarator( CurToken ) ) { GetLocalVarDecls(); } - if( CHECK_STD( > , C89 ) ) { + if( CompVars.cstd > STD_C89 ) { declaration_allowed = true; } skip_to_next_token = false; @@ -1405,7 +1405,7 @@ void Statement( void ) case T_DOUBLE: case T_SIGNED: case T_UNSIGNED: - if( CHECK_STD( < , C99 ) ) { + if( CompVars.cstd < STD_C99 ) { CErr1( ERR_MISSING_RIGHT_BRACE ); } else { CErr1( ERR_UNEXPECTED_DECLARATION ); @@ -1440,7 +1440,7 @@ void Statement( void ) } } /* C99 has special semantics for return value of main() */ - if( CHECK_STD( > , C89 ) && strcmp( CurFunc->name, "main" ) == 0 ) { + if( ( CompVars.cstd > STD_C89 ) && strcmp( CurFunc->name, "main" ) == 0 ) { if( !return_at_outer_level ) { FixupC99MainReturn( func_result_handle, &return_info ); return_at_outer_level = true; diff --git a/bld/cc/c/csym.c b/bld/cc/c/csym.c index 03ae513c1c..711b6caed6 100644 --- a/bld/cc/c/csym.c +++ b/bld/cc/c/csym.c @@ -496,7 +496,7 @@ SYM_HANDLE SymAddL0( id_hash_idx hash, SYMPTR new_sym ) } -static SYM_HANDLE GetNewSym( SYMPTR sym, char id, TYPEPTR typ, stg_classes stg_class ) +static SYM_HANDLE GetNewDotSym( SYMPTR sym, char id, TYPEPTR typ, stg_classes stg_class ) { char name[3]; SYM_HANDLE sym_handle; @@ -513,11 +513,11 @@ static SYM_HANDLE GetNewSym( SYMPTR sym, char id, TYPEPTR typ, stg_classes stg_c } -SYM_HANDLE MakeNewSym( SYMPTR sym, char id, TYPEPTR typ, stg_classes stg_class ) +SYM_HANDLE MakeNewDotSym( SYMPTR sym, char id, TYPEPTR typ, stg_classes stg_class ) { SYM_HANDLE sym_handle; - sym_handle = GetNewSym( sym, id, typ, stg_class ); + sym_handle = GetNewDotSym( sym, id, typ, stg_class ); if( SymLevel != 0 ) { sym->handle = CurFunc->u.func.locals; CurFunc->u.func.locals = sym_handle; diff --git a/bld/cc/c/ctype.c b/bld/cc/c/ctype.c index bd8d04c60a..642d691d3f 100644 --- a/bld/cc/c/ctype.c +++ b/bld/cc/c/ctype.c @@ -243,7 +243,8 @@ type_modifiers TypeQualifier( void ) default: return( flags ); } - if( (flags & bit) && CHECK_STD( < , C99 ) ) + if( (flags & bit) + && ( CompVars.cstd < STD_C99 ) ) CErr1( ERR_REPEATED_MODIFIER ); flags |= bit; NextToken(); @@ -1353,7 +1354,8 @@ static void CheckBitfieldType( TYPEPTR typ ) } switch( typ->decl_type ) { case TYP_BOOL: - if( !CompFlags.extensions_enabled && CHECK_STD( < , C99 ) ) { + if( !CompFlags.extensions_enabled + && ( CompVars.cstd < STD_C99 ) ) { break; } /* fall through */ diff --git a/bld/cc/c/ppexpn.c b/bld/cc/c/ppexpn.c index db3b78245e..0deca9cc3a 100644 --- a/bld/cc/c/ppexpn.c +++ b/bld/cc/c/ppexpn.c @@ -385,7 +385,7 @@ static bool COperand( void ) case TYP_LONG_DOUBLE: CErr1( ERR_EXPR_MUST_BE_INTEGRAL ); done = true; - if( CHECK_STD( < , C99 ) ) { + if( CompVars.cstd < STD_C99 ) { U32ToU64Set( p, (signed_32)SafeAtof( Buffer ) ); } else { p.u.sval.u._64[0] = (long long)SafeAtof( Buffer ); @@ -402,7 +402,7 @@ static bool COperand( void ) p.no_sign = 1; break; case TYP_ULONG64: - if( CHECK_STD( < , C99 ) ) { + if( CompVars.cstd < STD_C99 ) { U32ToU64Set( p, U32FetchTrunc( Constant64 ) ); } else { p.u.uval = Constant64; @@ -410,7 +410,7 @@ static bool COperand( void ) p.no_sign = 1; break; case TYP_LONG64: - if( CHECK_STD( < , C99 ) ) { + if( CompVars.cstd < STD_C99 ) { U32ToU64Set( p, U32FetchTrunc( Constant64 ) ); } else { p.u.uval = Constant64; @@ -418,7 +418,7 @@ static bool COperand( void ) p.no_sign = 0; break; default: - if( CHECK_STD( < , C99 ) ) { + if( CompVars.cstd < STD_C99 ) { U32ToU64Set( p, Constant ); } else { I32ToI64( Constant, &(p.u.sval) ); @@ -657,7 +657,7 @@ static bool COr( void ) TOKEN token; if( Binary( &token, &e1, &e2, &loc ) ) { - if( CHECK_STD( < , C99 ) ) { + if( CompVars.cstd < STD_C99 ) { U32ToU64Set( e1, U64Low( e1 ) | U64Low( e2 ) ); } else { U64OrEq( e1, e2 ); @@ -680,7 +680,7 @@ static bool CXOr( void ) TOKEN token; if( Binary( &token, &e1, &e2, &loc ) ) { - if( CHECK_STD( < , C99 ) ) { + if( CompVars.cstd < STD_C99 ) { U32ToU64Set( e1, U64Low( e1 ) ^ U64Low( e2 ) ); } else { U64XOrEq( e1, e2 ); @@ -703,7 +703,7 @@ static bool CAnd( void ) TOKEN token; if( Binary( &token, &e1, &e2, &loc ) ) { - if( CHECK_STD( < , C99 ) ) { + if( CompVars.cstd < STD_C99 ) { U32ToU64Set( e1, U64Low( e1 ) & U64Low( e2 ) ); } else { U64AndEq( e1, e2 ); @@ -754,7 +754,7 @@ static bool CRelational( void ) if( Binary( &token, &e1, &e2, &loc ) ) { switch( token ) { case T_LT: - if( CHECK_STD( < , C99 ) ) { + if( CompVars.cstd < STD_C99 ) { if( e1.no_sign || e2.no_sign ) { val = U64Low( e1 ) < U64Low( e2 ); } else { @@ -770,7 +770,7 @@ static bool CRelational( void ) U32ToU64Set( e1, val ); break; case T_LE: - if( CHECK_STD( < , C99 ) ) { + if( CompVars.cstd < STD_C99 ) { if( e1.no_sign || e2.no_sign ) { val = U64Low( e1 ) <= U64Low( e2 ); } else { @@ -786,7 +786,7 @@ static bool CRelational( void ) U32ToU64Set( e1, val ); break; case T_GT: - if( CHECK_STD( < , C99 ) ) { + if( CompVars.cstd < STD_C99 ) { if( e1.no_sign || e2.no_sign ) { val = U64Low( e1 ) > U64Low( e2 ); } else { @@ -802,7 +802,7 @@ static bool CRelational( void ) U32ToU64Set( e1, val ); break; case T_GE: - if( CHECK_STD( < , C99 ) ) { + if( CompVars.cstd < STD_C99 ) { if( e1.no_sign || e2.no_sign ) { val = U64Low( e1 ) >= U64Low( e2 ); } else { @@ -839,7 +839,7 @@ static bool CShift( void ) if( Binary( &token, &e1, &e2, &loc ) ) { switch( token ) { case T_RSHIFT: - if( CHECK_STD( < , C99 ) ) { + if( CompVars.cstd < STD_C99 ) { if( U64Low( e2 ) > 32 || ( U64High( e2 ) != 0 ) ) { if( e1.no_sign ) { U64SetZero( e1 ); @@ -878,7 +878,7 @@ static bool CShift( void ) } break; case T_LSHIFT: - if( CHECK_STD( < , C99 ) ) { + if( CompVars.cstd < STD_C99 ) { if( U64Low( e2 ) > 32 || ( U64High( e2 ) != 0 ) ) { U64SetZero( e1 ); } else { @@ -913,7 +913,7 @@ static bool CAdditive( void ) if( Binary( &token, &e1, &e2, &loc ) ) { switch( token ) { case T_PLUS: - if( CHECK_STD( < , C99 ) ) { + if( CompVars.cstd < STD_C99 ) { U32ToU64Set( e1, U64Low( e1 ) + U64Low( e2 ) ); } else { U64AddEq( e1, e2 ); @@ -921,7 +921,7 @@ static bool CAdditive( void ) e1.no_sign |= e2.no_sign; break; case T_MINUS: - if( CHECK_STD( < , C99 ) ) { + if( CompVars.cstd < STD_C99 ) { U32ToU64Set( e1, U64Low( e1 ) - U64Low( e2 ) ); } else { U64SubEq( e1, e2 ); @@ -950,14 +950,14 @@ static bool CMultiplicative( void ) if( Binary( &token, &e1, &e2, &loc ) ) { switch( token ) { case T_TIMES: - if( CHECK_STD( < , C99 ) ) { + if( CompVars.cstd < STD_C99 ) { U32ToU64Set( e1, U64Low( e1 ) * U64Low( e2 ) ); } else { U64MulEq( e1, e2 ); } break; case T_DIV: - if( CHECK_STD( < , C99 ) ) { + if( CompVars.cstd < STD_C99 ) { if( U64Zero( e2 ) ) { U64SetZero( e1 ); } else if( e1.no_sign || e2.no_sign ) { @@ -978,7 +978,7 @@ static bool CMultiplicative( void ) } break; case T_PERCENT: - if( CHECK_STD( < , C99 ) ) { + if( CompVars.cstd < STD_C99 ) { if( U64Zero( e2 ) ) { U64SetZero( e1 ); } else if( e1.no_sign || e2.no_sign ) { @@ -1024,7 +1024,7 @@ static bool CUnary( void ) case T_UNARY_PLUS: break; case T_UNARY_MINUS: - if( CHECK_STD( < , C99 ) ) { + if( CompVars.cstd < STD_C99 ) { U32ToU64Set( p, - I64Low( p ) ); } else { U64Neg( &((p).u.uval), &((p).u.uval ) ); @@ -1041,7 +1041,7 @@ static bool CUnary( void ) break; case T_TILDE: // case T_ALT_TILDE: - if( CHECK_STD( < , C99 ) ) { + if( CompVars.cstd < STD_C99 ) { U32ToU64Set( p, ~U64Low( p ) ); } else { U64Not( &(p.u.sval), &(p.u.sval) ); diff --git a/bld/cc/h/cconst.h b/bld/cc/h/cconst.h index 90e9d6f004..1d5f7286ac 100644 --- a/bld/cc/h/cconst.h +++ b/bld/cc/h/cconst.h @@ -55,7 +55,7 @@ #define PPOPERATOR_PRAGMA "_Pragma" #define IS_PPOPERATOR_DEFINED(s) (strcmp(s, PPOPERATOR_DEFINED) == 0) -#define IS_PPOPERATOR_PRAGMA(s,l) ((CompFlags.extensions_enabled || CHECK_STD( > , C89 )) \ +#define IS_PPOPERATOR_PRAGMA(s,l) ((CompFlags.extensions_enabled || CompVars.cstd > STD_C89) \ && l == LENLIT(PPOPERATOR_PRAGMA) \ && strcmp(s, PPOPERATOR_PRAGMA) == 0) diff --git a/bld/cc/h/ctypes.h b/bld/cc/h/ctypes.h index a07c3a2fe7..df2e1a99c5 100644 --- a/bld/cc/h/ctypes.h +++ b/bld/cc/h/ctypes.h @@ -130,7 +130,7 @@ typedef enum sym_flags { SYM_EMITTED = 0x00000004, /* symbol has been emitted to cgen */ SYM_DEFINED = 0x00000008, /* symbol has been defined */ SYM_INITIALIZED = 0x00000010, /* variable has been initialized */ - SYM_TEMP = 0x00000020, /* this is a temp created by MakeNewSym */ + SYM_TEMP = 0x00000020, /* this is a temp created by MakeNewDotSym */ SYM_ASSIGNED = 0x00000040, /* variable has been assigned to */ SYM_ADDR_TAKEN = 0x00000080, /* variable/func has had its address taken */ SYM_IGNORE_UNREFERENCE = 0x00000100, /* don't print msg if unreferenced */ @@ -687,9 +687,6 @@ typedef struct comp_vars { cstd_ver cstd; } comp_vars; -#define CHECK_STD(o,v) (CompVars.cstd o STD_ ## v) -#define SET_STD(v) CompVars.cstd = STD_ ## v - /* Target System types */ enum { TS_OTHER, diff --git a/bld/cc/h/cvars.h b/bld/cc/h/cvars.h index fa0dac92ac..234bcb9573 100644 --- a/bld/cc/h/cvars.h +++ b/bld/cc/h/cvars.h @@ -764,7 +764,7 @@ extern SYMPTR SymGetPtr( SYM_HANDLE ); extern void SymReplace( SYMPTR, SYM_HANDLE ); extern void EndBlock( void ); extern SYM_HANDLE MakeFunction( const char *, TYPEPTR ); -extern SYM_HANDLE MakeNewSym( SYMPTR, char, TYPEPTR, stg_classes ); +extern SYM_HANDLE MakeNewDotSym( SYMPTR, char, TYPEPTR, stg_classes ); extern LABELPTR LkLabel( const char * ); extern void FreeLabels( void ); extern XREFPTR NewXref( XREFPTR );