Replace <ctype.h> includes with "nctype.h"

For almost everything we should use "nctype.h". Right now we don't
have a nasm_toupper() to use <ctype.h> for things that need toupper().

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

22 files changed, 24 insertions, 22 deletions

diff --git a/asm/directiv.c b/asm/directiv.c
index 94b2468f..8be5e2c5 100644
--- a/asm/directiv.c
+++ b/asm/directiv.c
@@ -38,7 +38,7 @@
 #include "compiler.h"
 
 #include <stdlib.h>
-#include <ctype.h>
+#include "nctype.h"
 #include <limits.h>
 
 #include "nasm.h"
diff --git a/asm/eval.c b/asm/eval.c
index 354d5b24..73d42223 100644
--- a/asm/eval.c
+++ b/asm/eval.c
@@ -40,7 +40,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
-#include <ctype.h>
+#include "nctype.h"
 
 #include "nasm.h"
 #include "nasmlib.h"
diff --git a/asm/float.c b/asm/float.c
index 71896a3a..3d389447 100644
--- a/asm/float.c
+++ b/asm/float.c
@@ -37,7 +37,7 @@
 
 #include "compiler.h"
 
-#include <ctype.h>
+#include "nctype.h"
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/asm/listing.c b/asm/listing.c
index 3205a0df..57f3758f 100644
--- a/asm/listing.c
+++ b/asm/listing.c
@@ -40,7 +40,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
-#include <ctype.h>
+#include "nctype.h"
 
 #include "nasm.h"
 #include "nasmlib.h"
diff --git a/asm/parser.c b/asm/parser.c
index 451ffa67..cfaff93d 100644
--- a/asm/parser.c
+++ b/asm/parser.c
@@ -40,7 +40,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
-#include <ctype.h>
+#include "nctype.h"
 
 #include "nasm.h"
 #include "insns.h"
diff --git a/asm/pptok.pl b/asm/pptok.pl
index 41f5f9fc..1dd5733a 100755
--- a/asm/pptok.pl
+++ b/asm/pptok.pl
@@ -179,7 +179,7 @@ if ($what eq 'c') {
     die if ($n & ($n-1));
 
     print OUT "#include \"compiler.h\"\n";
-    print OUT "#include <ctype.h>\n";
+    print OUT "#include \"nctype.h\"\n";
     print OUT "#include \"nasmlib.h\"\n";
     print OUT "#include \"hashtbl.h\"\n";
     print OUT "#include \"preproc.h\"\n";
diff --git a/asm/pragma.c b/asm/pragma.c
index 12b7ed25..363e593c 100644
--- a/asm/pragma.c
+++ b/asm/pragma.c
@@ -40,7 +40,7 @@
 #include "compiler.h"
 
 #include <stdlib.h>
-#include <ctype.h>
+#include "nctype.h"
 #include <limits.h>
 
 #include "nasm.h"
diff --git a/asm/preproc-nop.c b/asm/preproc-nop.c
index 12b8443b..63fa3c1e 100644
--- a/asm/preproc-nop.c
+++ b/asm/preproc-nop.c
@@ -42,7 +42,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <ctype.h>
+#include "nctype.h"
 #include <limits.h>
 #include <time.h>
 
diff --git a/asm/preproc.c b/asm/preproc.c
index 2ee37ea4..7eb78343 100644
--- a/asm/preproc.c
+++ b/asm/preproc.c
@@ -66,7 +66,7 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stddef.h>
-#include <ctype.h>
+#include "nctype.h"
 #include <limits.h>
 
 #include "nasm.h"
diff --git a/asm/stdscan.c b/asm/stdscan.c
index 27879259..e3bae3e6 100644
--- a/asm/stdscan.c
+++ b/asm/stdscan.c
@@ -35,7 +35,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
+#include "nctype.h"
 
 #include "nasm.h"
 #include "nasmlib.h"
diff --git a/disasm/ndisasm.c b/disasm/ndisasm.c
index 4497c388..924eb568 100644
--- a/disasm/ndisasm.c
+++ b/disasm/ndisasm.c
@@ -40,7 +40,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <ctype.h>
+#include "nctype.h"
 #include <errno.h>
 
 #include "insns.h"
diff --git a/nasmlib/readnum.c b/nasmlib/readnum.c
index 3ed6b3f2..b491bc73 100644
--- a/nasmlib/readnum.c
+++ b/nasmlib/readnum.c
@@ -37,7 +37,7 @@
 
 #include "compiler.h"
 
-#include <ctype.h>
+#include "nctype.h"
 
 #include "nasmlib.h"
 #include "error.h"
diff --git a/output/outaout.c b/output/outaout.c
index 0a011794..a0fdc674 100644
--- a/output/outaout.c
+++ b/output/outaout.c
@@ -40,7 +40,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
+#include "nctype.h"
 
 #include "nasm.h"
 #include "nasmlib.h"
diff --git a/output/outas86.c b/output/outas86.c
index 075ed05e..00c57584 100644
--- a/output/outas86.c
+++ b/output/outas86.c
@@ -40,7 +40,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
+#include "nctype.h"
 
 #include "nasm.h"
 #include "nasmlib.h"
diff --git a/output/outbin.c b/output/outbin.c
index 3eaded0a..be395d7a 100644
--- a/output/outbin.c
+++ b/output/outbin.c
@@ -77,7 +77,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
+#include "nctype.h"
 
 #include "nasm.h"
 #include "nasmlib.h"
diff --git a/output/outcoff.c b/output/outcoff.c
index a2c427a3..4fc3f775 100644
--- a/output/outcoff.c
+++ b/output/outcoff.c
@@ -40,7 +40,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
+#include "nctype.h"
 #include <time.h>
 
 #include "nasm.h"
diff --git a/output/outdbg.c b/output/outdbg.c
index 601f8719..1b77d487 100644
--- a/output/outdbg.c
+++ b/output/outdbg.c
@@ -40,7 +40,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
+#include "nctype.h"
 #include <errno.h>
 
 #include "nasm.h"
diff --git a/output/outieee.c b/output/outieee.c
index 57c52450..b5ea2a41 100644
--- a/output/outieee.c
+++ b/output/outieee.c
@@ -71,7 +71,8 @@
 #include <stdlib.h>
 #include <time.h>
 #include <stdarg.h>             /* Note: we need the ANSI version of stdarg.h */
-#include <ctype.h>
+#include <ctype.h>              /* For toupper() */
+#include "nctype.h"
 
 #include "nasm.h"
 #include "nasmlib.h"
diff --git a/output/outmacho.c b/output/outmacho.c
index 841dbf0a..342c6c18 100644
--- a/output/outmacho.c
+++ b/output/outmacho.c
@@ -40,7 +40,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
+#include "nctype.h"
 
 #include "nasm.h"
 #include "nasmlib.h"
diff --git a/output/outobj.c b/output/outobj.c
index dee4f97e..1bf7e8d7 100644
--- a/output/outobj.c
+++ b/output/outobj.c
@@ -40,7 +40,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
+#include <ctype.h>              /* For toupper() */
+#include "nctype.h"
 #include <limits.h>
 
 #include "nasm.h"
diff --git a/output/outrdf2.c b/output/outrdf2.c
index 008e7f14..e92906cd 100644
--- a/output/outrdf2.c
+++ b/output/outrdf2.c
@@ -41,7 +41,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
+#include "nctype.h"
 #include <assert.h>
 
 #include "nasm.h"
diff --git a/output/stabs.h b/output/stabs.h
index d40a5724..dbc49868 100644
--- a/output/stabs.h
+++ b/output/stabs.h
@@ -34,7 +34,7 @@
 #ifndef STABS_H_
 #define STABS_H_
 
-#include <ctype.h>
+#include "nctype.h"
 
 #include "compiler.h"
 #include "nasmlib.h"