4 files changed, 5 insertions, 9 deletions
diff --git a/command_line/CmdLine/Src/OSLib/Generic.c b/command_line/CmdLine/Src/OSLib/Generic.c
index f2c2ac9..84de7fd 100644
--- a/command_line/CmdLine/Src/OSLib/Generic.c
+++ b/command_line/CmdLine/Src/OSLib/Generic.c
@@ -7,7 +7,7 @@ static OSOpenedDir wilddirref;
 static OSSpec wildmatch;
 char STSbuf[256];
 
-inline char dummyfunc(int ch) {
+CW_INLINE char dummyfunc(int ch) {
     return ch;
 }
 
diff --git a/command_line/CmdLine/Src/OSLib/MacFileTypes.c b/command_line/CmdLine/Src/OSLib/MacFileTypes.c
index 5ebb4d6..d8e63a8 100644
--- a/command_line/CmdLine/Src/OSLib/MacFileTypes.c
+++ b/command_line/CmdLine/Src/OSLib/MacFileTypes.c
@@ -15,8 +15,7 @@ void OS_AddFileTypeMappingList(OSFileTypeMappings **list, const OSFileTypeMappin
         scan = &(*scan)->next;
 
     *scan = malloc(sizeof(OSFileTypeMappings));
-#line 40
-    OPTION_ASSERT(*scan != NULL);
+    OS_ASSERT(40, *scan != NULL);
     (*scan)->mappingList = entry;
     (*scan)->next = 0;
 }
diff --git a/command_line/CmdLine/Src/OSLib/MacSpecs.c b/command_line/CmdLine/Src/OSLib/MacSpecs.c
index ece3d96..6d11620 100644
--- a/command_line/CmdLine/Src/OSLib/MacSpecs.c
+++ b/command_line/CmdLine/Src/OSLib/MacSpecs.c
@@ -94,8 +94,7 @@ static DirNode *FindDirMapEntry(unsigned int dirID) {
 
     row = dirID >> 8;
     col = dirID & 0xFF;
-#line 166
-    OPTION_ASSERT(dirID != 2);
+    OS_ASSERT(166, dirID != 2);
 
     if (row >= dirMapRows)
         return 0;
@@ -167,8 +166,7 @@ static int FindOrAdd(const OSPathSpec *path, unsigned int *vRefNum, unsigned int
     *vRefNum = vol->vRefNum;
     level = &vol->root;
     ptr = &pb[1];
-#line 267
-    OPTION_ASSERT(*pb == OS_PATHSEP);
+    OS_ASSERT(267, *pb == OS_PATHSEP);
 
     while (*ptr) {
         st = ptr;
diff --git a/command_line/CmdLine/Src/OSLib/StringUtils.c b/command_line/CmdLine/Src/OSLib/StringUtils.c
index 9d5d110..b2a71e7 100644
--- a/command_line/CmdLine/Src/OSLib/StringUtils.c
+++ b/command_line/CmdLine/Src/OSLib/StringUtils.c
@@ -91,8 +91,7 @@ char *mvprintf(char *mybuf, unsigned int len, const char *format, va_list va) {
     int ret;
     char *buf;
 
-#line 134
-    OPTION_ASSERT(mybuf != NULL);
+    OS_ASSERT(134, mybuf != NULL);
 
     maxlen = len - 1;
     buf = mybuf;