Fix a few more <ctype.h> instances

A few isolated instances of isalpha() and isxdigit().

diff --git a/nasm.h b/nasm.h
index 5a47192..2b61e28 100644 (file)
--- a/nasm.h
+++ b/nasm.h
@@ -354,10 +354,10 @@ extern Preproc nasmpp;
  * start.
  */
 
-#define isidstart(c) ( isalpha(c) || (c)=='_' || (c)=='.' || (c)=='?' \
+#define isidstart(c) ( nasm_isalpha(c) || (c)=='_' || (c)=='.' || (c)=='?' \
                                   || (c)=='@' )
-#define isidchar(c)  ( isidstart(c) || nasm_isdigit(c) || (c)=='$' || (c)=='#' \
-                                                  || (c)=='~' )
+#define isidchar(c)  ( isidstart(c) || nasm_isdigit(c) || \
+                      (c)=='$' || (c)=='#' || (c)=='~' )
 
 /* Ditto for numeric constants. */
 

diff --git a/nasmlib.h b/nasmlib.h
index 51e787d..5492208 100644 (file)
--- a/nasmlib.h
+++ b/nasmlib.h
@@ -29,9 +29,11 @@ extern unsigned char nasm_tolower_tab[256];
 
 /* Wrappers around <ctype.h> functions */
 /* These are only valid for values that cannot include EOF */
-#define nasm_isspace(x) isspace((unsigned char)(x))
-#define nasm_isalnum(x) isalnum((unsigned char)(x))
-#define nasm_isdigit(x) isdigit((unsigned char)(x))
+#define nasm_isspace(x)  isspace((unsigned char)(x))
+#define nasm_isalpha(x)  isalpha((unsigned char)(x))
+#define nasm_isdigit(x)  isdigit((unsigned char)(x))
+#define nasm_isalnum(x)  isalnum((unsigned char)(x))
+#define nasm_isxdigit(x) isxdigit((unsigned char)(x))
 
 /*
  * If this is defined, the wrappers around malloc et al will

diff --git a/preproc.c b/preproc.c
index 1489222..4fa0667 100644 (file)
--- a/preproc.c
+++ b/preproc.c
@@ -882,7 +882,7 @@ static Token *tokenize(char *line)
                    while (*r == '_')
                        r++;
 
-                   if (nasm_isdigit(*r) || (is_hex && isxdigit(*r)) ||
+                   if (nasm_isdigit(*r) || (is_hex && nasm_isxdigit(*r)) ||
                        (!is_hex && (*r == 'e' || *r == 'E')) ||
                        (*r == 'p' || *r == 'P')) {
                        p = r;