remove nonstd/ctype.h

12 files changed, 31 insertions, 11 deletions

diff --git a/src/ctype/_ctype.h b/src/ctype/_ctype.h
new file mode 100644
index 00000000..fa584da6
--- /dev/null
+++ b/src/ctype/_ctype.h
@@ -0,0 +1,20 @@
+#ifndef ___CTYPE_H__
+#define ___CTYPE_H__
+
+#include "nonstd/internal.h"
+
+typedef enum {
+	CT_ALPHA = (1 << 0),
+	CT_CNTRL = (1 << 1),
+	CT_DIGIT = (1 << 2),
+	CT_GRAPH = (1 << 3),
+	CT_LOWER = (1 << 4),
+	CT_PRINT = (1 << 5),
+	CT_PUNCT = (1 << 6),
+	CT_SPACE = (1 << 7),
+	CT_UPPER = (1 << 8),
+	CT_XDIGIT = (1 << 9),
+	CT_BLANK = (1 << 10),
+} ctype_t;
+
+#endif
diff --git a/src/ctype/isblank.c b/src/ctype/isblank.c
index 3693bc97..38d42ff9 100644
--- a/src/ctype/isblank.c
+++ b/src/ctype/isblank.c
@@ -1,7 +1,7 @@
 #include <ctype.h>
 #include "limits.h"
 #include "locale.h"
-#include "nonstd/ctype.h"
+#include "../_ctype.h"
 #include "nonstd/assert.h"
 
 /** test whether a character is blank **/
diff --git a/src/ctype/iscntrl.c b/src/ctype/iscntrl.c
index 1508f318..679d3d24 100644
--- a/src/ctype/iscntrl.c
+++ b/src/ctype/iscntrl.c
@@ -1,7 +1,7 @@
 #include <ctype.h>
 #include "limits.h"
 #include "nonstd/assert.h"
-#include "nonstd/ctype.h"
+#include "_ctype.h"
 
 /** test whether a character is a control character */
 
diff --git a/src/ctype/isgraph.c b/src/ctype/isgraph.c
index 7f3f0bad..d041e840 100644
--- a/src/ctype/isgraph.c
+++ b/src/ctype/isgraph.c
@@ -1,7 +1,7 @@
 #include <ctype.h>
 #include "limits.h"
 #include "nonstd/assert.h"
-#include "nonstd/ctype.h"
+#include "_ctype.h"
 
 /** test whether a character is graphic **/
 
diff --git a/src/ctype/islower.c b/src/ctype/islower.c
index c08522a1..b2e0b678 100644
--- a/src/ctype/islower.c
+++ b/src/ctype/islower.c
@@ -1,7 +1,7 @@
 #include <ctype.h>
 #include "limits.h"
 #include "nonstd/assert.h"
-#include "nonstd/ctype.h"
+#include "_ctype.h"
 
 /** test whether a character is a lowercase letter **/
 
diff --git a/src/ctype/isprint.c b/src/ctype/isprint.c
index a71c6173..4a426fe1 100644
--- a/src/ctype/isprint.c
+++ b/src/ctype/isprint.c
@@ -1,7 +1,7 @@
 #include <ctype.h>
 #include "limits.h"
 #include "nonstd/assert.h"
-#include "nonstd/ctype.h"
+#include "_ctype.h"
 
 /** test whether a character is printable **/
 
diff --git a/src/ctype/ispunct.c b/src/ctype/ispunct.c
index f092682f..e55dac2e 100644
--- a/src/ctype/ispunct.c
+++ b/src/ctype/ispunct.c
@@ -1,7 +1,7 @@
 #include <ctype.h>
 #include "limits.h"
 #include "nonstd/assert.h"
-#include "nonstd/ctype.h"
+#include "_ctype.h"
 
 /** test whether a character is punctuation **/
 
diff --git a/src/ctype/isspace.c b/src/ctype/isspace.c
index 8b8d6d09..16cb0c24 100644
--- a/src/ctype/isspace.c
+++ b/src/ctype/isspace.c
@@ -1,7 +1,7 @@
 #include <ctype.h>
 #include "limits.h"
 #include "nonstd/assert.h"
-#include "nonstd/ctype.h"
+#include "_ctype.h"
 
 /** test whether a character is white-space **/
 
diff --git a/src/ctype/isupper.c b/src/ctype/isupper.c
index 9e9910e8..d0d58eaa 100644
--- a/src/ctype/isupper.c
+++ b/src/ctype/isupper.c
@@ -1,7 +1,7 @@
 #include <ctype.h>
 #include "limits.h"
 #include "nonstd/assert.h"
-#include "nonstd/ctype.h"
+#include "_ctype.h"
 
 /** test whether a character is an uppercase letter **/
 
diff --git a/src/ctype/isxdigit.c b/src/ctype/isxdigit.c
index a17657fa..543774a3 100644
--- a/src/ctype/isxdigit.c
+++ b/src/ctype/isxdigit.c
@@ -1,7 +1,7 @@
 #include <ctype.h>
 #include "limits.h"
 #include "nonstd/assert.h"
-#include "nonstd/ctype.h"
+#include "_ctype.h"
 
 /** test whether a character is a hexadecimal digit **/
 
diff --git a/src/ctype/tolower.c b/src/ctype/tolower.c
index 3464d655..0994071b 100644
--- a/src/ctype/tolower.c
+++ b/src/ctype/tolower.c
@@ -2,7 +2,7 @@
 #include "stdio.h"
 #include "limits.h"
 #include "nonstd/assert.h"
-#include "nonstd/ctype.h"
+#include "_ctype.h"
 
 /** convert an uppercase letter to lowercase **/
 
diff --git a/src/ctype/toupper.c b/src/ctype/toupper.c
index dc9660ec..e40e4a73 100644
--- a/src/ctype/toupper.c
+++ b/src/ctype/toupper.c
@@ -2,7 +2,7 @@
 #include "stdio.h"
 #include "limits.h"
 #include "nonstd/assert.h"
-#include "nonstd/ctype.h"
+#include "_ctype.h"
 
 /** convert a lowercase letter to uppercase **/