From 775b6861666af36d317fb577cf489e2c6377f878 Mon Sep 17 00:00:00 2001 From: Ash Wolf Date: Fri, 14 Oct 2022 23:15:32 +0100 Subject: add tons of stuff --- command_line/CmdLine/Src/CLMain.c | 4 ++-- command_line/CmdLine/Src/MacEmul/Files.c | 2 -- command_line/CmdLine/Src/MacEmul/Resources.c | 2 -- command_line/CmdLine/Src/OSLib/MacFileTypes.c | 2 -- command_line/CmdLine/Src/OSLib/MacSpecs.c | 2 -- command_line/CmdLine/Src/OSLib/StringUtils.c | 2 -- 6 files changed, 2 insertions(+), 12 deletions(-) (limited to 'command_line/CmdLine') diff --git a/command_line/CmdLine/Src/CLMain.c b/command_line/CmdLine/Src/CLMain.c index 065ae5b..f8247c4 100644 --- a/command_line/CmdLine/Src/CLMain.c +++ b/command_line/CmdLine/Src/CLMain.c @@ -71,8 +71,8 @@ static SInt16 CLT_GetPanelList(const CWPanelList **panelList) { } static SInt16 CLT_GetTargetList(const CWTargetList **targetList) { - static FourCharCode sCPU = CWFOURCHAR('*','*','*','*'); - static FourCharCode sOS = CWFOURCHAR('*','*','*','*'); + static FourCharCode sCPU = targetCPUAny; + static FourCharCode sOS = targetOSAny; static CWTargetList sTargetList = { kCurrentCWTargetListVersion, 1, diff --git a/command_line/CmdLine/Src/MacEmul/Files.c b/command_line/CmdLine/Src/MacEmul/Files.c index 5246ee2..9a9cb60 100644 --- a/command_line/CmdLine/Src/MacEmul/Files.c +++ b/command_line/CmdLine/Src/MacEmul/Files.c @@ -1,7 +1,5 @@ #include "mwcc_decomp.h" -#define OPTION_ASSERT(cond) do { if (!(cond)) { printf("%s:%u: failed assertion\n", __FILE__, __LINE__); abort(); } } while(0) - typedef struct MacFileInfo { UInt32 ioFlCrDat; UInt32 ioFlMdDat; diff --git a/command_line/CmdLine/Src/MacEmul/Resources.c b/command_line/CmdLine/Src/MacEmul/Resources.c index fcbed0b..796ed43 100644 --- a/command_line/CmdLine/Src/MacEmul/Resources.c +++ b/command_line/CmdLine/Src/MacEmul/Resources.c @@ -1,7 +1,5 @@ #include "mwcc_decomp.h" -#define OPTION_ASSERT(cond) do { if (!(cond)) { printf("%s:%u: failed assertion\n", __FILE__, __LINE__); abort(); } } while(0) - // Fork Attributes enum { mapReadOnly = 0x80, diff --git a/command_line/CmdLine/Src/OSLib/MacFileTypes.c b/command_line/CmdLine/Src/OSLib/MacFileTypes.c index 5c9cb1c..05a2ae9 100644 --- a/command_line/CmdLine/Src/OSLib/MacFileTypes.c +++ b/command_line/CmdLine/Src/OSLib/MacFileTypes.c @@ -1,7 +1,5 @@ #include "oslib.h" -#define OPTION_ASSERT(cond) do { if (!(cond)) { printf("%s:%u: failed assertion\n", __FILE__, __LINE__); abort(); } } while(0) - static OSFileTypeMappings *defaultList; static OSFileTypeMappings **fmList = &defaultList; int (*__OS_ExtendedGetMacFileTypeHook)(const OSSpec *, OSType *); diff --git a/command_line/CmdLine/Src/OSLib/MacSpecs.c b/command_line/CmdLine/Src/OSLib/MacSpecs.c index defcab1..ece3d96 100644 --- a/command_line/CmdLine/Src/OSLib/MacSpecs.c +++ b/command_line/CmdLine/Src/OSLib/MacSpecs.c @@ -3,8 +3,6 @@ extern char STSbuf[256]; -#define OPTION_ASSERT(cond) do { if (!(cond)) { printf("%s:%u: failed assertion\n", __FILE__, __LINE__); abort(); } } while(0) - typedef struct DirNode { char *name; unsigned int dirID; diff --git a/command_line/CmdLine/Src/OSLib/StringUtils.c b/command_line/CmdLine/Src/OSLib/StringUtils.c index 4ede522..9d5d110 100644 --- a/command_line/CmdLine/Src/OSLib/StringUtils.c +++ b/command_line/CmdLine/Src/OSLib/StringUtils.c @@ -1,8 +1,6 @@ #include "oslib.h" #include "macemul.h" -#define OPTION_ASSERT(cond) do { if (!(cond)) { printf("%s:%u: failed assertion\n", __FILE__, __LINE__); abort(); } } while(0) - static char pfbuf[256]; StringPtr _pstrcpy(StringPtr dst, ConstStringPtr src) { -- cgit v1.2.3