diff --git a/include/asm/lexer.h b/include/asm/lexer.h index 3caea4c6..b20df46f 100644 --- a/include/asm/lexer.h +++ b/include/asm/lexer.h @@ -59,9 +59,7 @@ extern void yyunputbytes(ULONG count); extern YY_BUFFER_STATE pCurrentBuffer; -#ifdef __GNUC__ -extern void strupr(char *s); -extern void strlwr(char *s); -#endif +extern void upperstring(char *s); +extern void lowerstring(char *s); #endif diff --git a/src/asm/asmy.y b/src/asm/asmy.y index 46d4554d..f75f5ffb 100644 --- a/src/asm/asmy.y +++ b/src/asm/asmy.y @@ -1079,9 +1079,9 @@ string : T_STRING | T_OP_STRCAT '(' string ',' string ')' { strcpy($$,$3); strcat($$,$5); } | T_OP_STRUPR '(' string ')' - { strcpy($$,$3); strupr($$); } + { strcpy($$,$3); upperstring($$); } | T_OP_STRLWR '(' string ')' - { strcpy($$,$3); strlwr($$); } + { strcpy($$,$3); lowerstring($$); } ; section: T_POP_SECTION string ',' sectiontype diff --git a/src/asm/lexer.c b/src/asm/lexer.c index 4b2548f4..33dd0904 100644 --- a/src/asm/lexer.c +++ b/src/asm/lexer.c @@ -39,9 +39,8 @@ ULONG tFloatingChars[256]; ULONG nFloating; enum eLexerState lexerstate = LEX_STATE_NORMAL; -#ifdef __GNUC__ void -strupr(char *s) +upperstring(char *s) { while (*s) { *s = toupper(*s); @@ -50,14 +49,14 @@ strupr(char *s) } void -strlwr(char *s) +lowerstring(char *s) { while (*s) { *s = tolower(*s); s += 1; } } -#endif + void yyskipbytes(ULONG count) { @@ -352,7 +351,7 @@ lex_AddStrings(struct sLexInitString * lex) (*ppHash)->nToken = lex->nToken; (*ppHash)->pNext = NULL; - strupr((*ppHash)->tzName); + upperstring((*ppHash)->tzName); if ((*ppHash)->nNameLength > nLexMaxLength) nLexMaxLength = (*ppHash)->nNameLength;