diff options
Diffstat (limited to '')
5 files changed, 16 insertions, 12 deletions
diff --git a/command_line/CmdLine/Src/Plugins/CLPlugins.c b/command_line/CmdLine/Src/Plugins/CLPlugins.c index 8db8398..3342dae 100644 --- a/command_line/CmdLine/Src/Plugins/CLPlugins.c +++ b/command_line/CmdLine/Src/Plugins/CLPlugins.c @@ -161,7 +161,7 @@ const OSFileTypeMappingList *Plugin_GetFileTypeMappingList(Plugin *pl) { } const CWObjectFlags *Plugin_CL_GetObjectFlags(Plugin *pl) { - static CWObjectFlags fake = { + static const CWObjectFlags fake = { 2, 0, "", "", "", "", "", "", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 diff --git a/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Options/Glue/ParserGlue-mach-ppc-cc.c b/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Options/Glue/ParserGlue-mach-ppc-cc.c index 7e741c3..f605817 100644 --- a/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Options/Glue/ParserGlue-mach-ppc-cc.c +++ b/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Options/Glue/ParserGlue-mach-ppc-cc.c @@ -75,7 +75,7 @@ static int MidParse() { pCmdLine.state = OptsCmdLineState_2; if (parseopts.possibleFiles > 0 && useDefaultIncludes) { - if ((env = GetEnvVar("MWCMachPPCIncludes", 1, &match))) { + if ((env = GetEnvVar("MWCMachPPCIncludes\0MWCIncludes\0", 1, &match))) { // FIXME can probably get rid of this cast later if (!AddAccessPathList(env, ':', ',', 1, (char *) match, 1, -1, 0)) return 0; diff --git a/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Plugin/libimp-mach-ppc.c b/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Plugin/libimp-mach-ppc.c index a0cf8c7..484db0f 100644 --- a/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Plugin/libimp-mach-ppc.c +++ b/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Plugin/libimp-mach-ppc.c @@ -8,7 +8,7 @@ CWPLUGIN_ENTRY (PPCLibImport_GetDropInFlags)(const DropInFlags **flags, SInt32 * kCurrentDropInFlagsVersion, CWDROPINCOMPILERTYPE, DROPINCOMPILERLINKERAPIVERSION_8, - kGeneratescode | kCanpreprocess | kCanprecompile | kCompAllowDupFileNames | kCompMultiTargAware, + kGeneratescode | kCompAllowDupFileNames | kCompMultiTargAware, Lang_MISC, DROPINCOMPILERLINKERAPIVERSION_12 }; diff --git a/compiler_and_linker/unsorted/CodeGen.c b/compiler_and_linker/unsorted/CodeGen.c index b79b423..d5ba07f 100644 --- a/compiler_and_linker/unsorted/CodeGen.c +++ b/compiler_and_linker/unsorted/CodeGen.c @@ -1217,7 +1217,7 @@ Boolean CodeGen_ReInitRuntimeObjects(Boolean is_precompiler) { rt_cvt_dbl_usll->name = GetHashNameNodeExport("__cvt_dbl_usll"); CMach_ReInitRuntimeObjects(); - Intrinsics_ReInitRuntimeObjects(is_precompiler); + return Intrinsics_ReInitRuntimeObjects(is_precompiler); } Boolean CodeGen_IsPublicRuntimeObject(Object *obj) { diff --git a/unsorted/Option.c b/unsorted/Option.c index e4851dc..2a53f38 100644 --- a/unsorted/Option.c +++ b/unsorted/Option.c @@ -82,13 +82,12 @@ int Args_StackSize(void) { void Args_Push(short flags, void *first, void *second) { OS_ASSERT(104, oStackPtr<MAXSTACK); - if (oStackPtr > 0) - { + if (oStackPtr > 0) { short prev = (flags & ARGFLAG_1) ? ARGFLAG_2 : (flags & ARGFLAG_2) ? ARGFLAG_1 : (flags & ARGFLAG_4) ? ARGFLAG_2 : -1; - OPTION_ASSERT(oStack[oStackPtr-1].flags & prev); + OS_ASSERT(111, oStack[oStackPtr-1].flags & prev); } oStack[oStackPtr].e.v.first = first; @@ -97,11 +96,10 @@ void Args_Push(short flags, void *first, void *second) { oStackPtr++; } -Opt48 *Args_Pop(short flags) -{ - OPTION_ASSERT(oStackPtr>0); +Opt48 *Args_Pop(short flags) { + OS_ASSERT(122, oStackPtr>0); --oStackPtr; - OPTION_ASSERT(oStack[oStackPtr].flags & flags); + OS_ASSERT(124, oStack[oStackPtr].flags & flags); return &oStack[oStackPtr]; } @@ -374,7 +372,13 @@ static Boolean Option_ContinuesThisLevel(int level, ArgToken *tok) { } } -static short endingStack[5][3]; +static short endingStack[5][3] = { + ATK_END, ATK_END, ATK_END, + ATK_ARG_END, ATK_COMMA, ATK_OPTION, + ATK_COMMA, ATK_END, ATK_END, + ATK_EQUALS, ATK_END, ATK_END, + ATK_END, ATK_END, ATK_END +}; static Boolean Option_IsEndingThisLevel(int level, ArgToken *tok) { ArgToken *tmp; |