1 files changed, 10 insertions, 10 deletions

diff --git a/compiler_and_linker/FrontEnd/C/CPrepTokenizer.c b/compiler_and_linker/FrontEnd/C/CPrepTokenizer.c
index 4c36aab..6d66b9d 100644
--- a/compiler_and_linker/FrontEnd/C/CPrepTokenizer.c
+++ b/compiler_and_linker/FrontEnd/C/CPrepTokenizer.c
@@ -81,7 +81,7 @@ loop:
                 }
             }
             if (tokenstacklevel <= 0) {
-                if (p[0] == '/' && (!copts.ANSI_strict || copts.cplusplus || copts.c9x)) {
+                if (p[0] == '/' && (!copts.ANSIstrict || copts.cplusplus || copts.c9x)) {
                     spaceskip = 1;
                     nextcharpos = (char *) CPrep_SkipNewComment(p + 1);
                     return CPrep_SkipNewCommentChar;
@@ -224,7 +224,7 @@ loop:
                         p += 2;
                 }
             }
-            if (p[0] == '/' && (!copts.ANSI_strict || copts.cplusplus)) {
+            if (p[0] == '/' && (!copts.ANSIstrict || copts.cplusplus)) {
                 spaceskip = 1;
                 pos = (char *) CPrep_SkipNewComment(p + 1);
                 return CPrep_SkipNewCommentChar;
@@ -676,7 +676,7 @@ static short intsuffix(short token, Boolean flag) {
             break;
         case 'i':
         case 'I':
-            if (copts.cpp_extensions && !copts.ANSI_strict && copts.longlong) {
+            if (copts.cpp_extensions && !copts.ANSIstrict && copts.longlong) {
                 pos = nextcharpos;
                 t = prepcurchar();
                 if (t == '6') {
@@ -745,7 +745,7 @@ static short floatsuffix(short token) {
             break;
         case 'd':
         case 'D':
-            if (!copts.ANSI_strict) {
+            if (!copts.ANSIstrict) {
                 pos = nextcharpos;
                 token = *pos;
                 whichtype = IT_DOUBLE;
@@ -1001,7 +1001,7 @@ void skipendofline(void) {
                     }
                 }
 
-                if (*p == '/' && (!copts.ANSI_strict || copts.cplusplus)) {
+                if (*p == '/' && (!copts.ANSIstrict || copts.cplusplus)) {
                     // EOL comment
                     pos = (char *) CPrep_SkipNewComment(p + 1);
                     if (CPrep_SkipNewCommentChar == '\r')
@@ -1133,7 +1133,7 @@ static short tapos(short _t) {
                     CError_FATAL(1386);
             }
         } else {
-            if (copts.unsignedchars)
+            if (copts.unsigned_char)
                 t &= 0xFF;
             CInt64_SetLong(&tkintconst, t);
             tksize = copts.cplusplus ? IT_SCHAR : IT_INT;
@@ -1556,7 +1556,7 @@ static short tzero(short t) {
         if (pos == p)
             CError_Error(CErrorStr105);
         pos = p;
-    } else if (!copts.ANSI_strict && (ch == 'b' || ch == 'B')) {
+    } else if (!copts.ANSIstrict && (ch == 'b' || ch == 'B')) {
         p = CInt64_ScanBinString(&tkintconst, pos, &failed);
         if (pos == p)
             CError_Error(CErrorStr105);
@@ -1691,7 +1691,7 @@ static short tchra(void) {
         return 0;
     if (!strcmp("auto", tkidentifier->name))
         return TK_AUTO;
-    if ((copts.cplusplus || !copts.only_std_keywords) && !strcmp("asm", tkidentifier->name))
+    if ((copts.cplusplus || !copts.onlystdkeywords) && !strcmp("asm", tkidentifier->name))
         return TK_ASM;
     if (copts.cplusplus && !in_assembler && !preprocessing_only) {
         if (!strcmp("and", tkidentifier->name))
@@ -1845,7 +1845,7 @@ static short tchri(void) {
     if (copts.cplusplus || copts.c9x) {
         if (!strcmp("inline", tkidentifier->name))
             return TK_INLINE;
-    } else if (!copts.only_std_keywords) {
+    } else if (!copts.onlystdkeywords) {
         if (!strcmp("inline", tkidentifier->name))
             return TK_INLINE;
     }
@@ -1933,7 +1933,7 @@ static short tchrp(short t) {
     pos = ReadIdentifier(pos - 1);
     if (macrocheck && macrotest())
         return 0;
-    if (!copts.only_std_keywords && !strcmp("pascal", tkidentifier->name))
+    if (!copts.onlystdkeywords && !strcmp("pascal", tkidentifier->name))
         return TK_PASCAL;
     if (copts.cplusplus && t == 'p') {
         if (!strcmp("private", tkidentifier->name))