Back up following macros by functions: ishexnumber, isideogram, isnumber,

isphonogram, isrune, isspecial. Fix ordering.

Reviewed by: bde

1 files changed, 58 insertions, 7 deletions

diff --git a/lib/libc/locale/isctype.c b/lib/libc/locale/isctype.c
index 4d51813..70bcfd4 100644
--- a/lib/libc/locale/isctype.c
+++ b/lib/libc/locale/isctype.c
@@ -37,6 +37,8 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $FreeBSD$
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
@@ -45,6 +47,14 @@ static char sccsid[] = "@(#)isctype.c	8.3 (Berkeley) 2/24/94";
 
 #include <ctype.h>
 
+#undef digittoint
+int
+digittoint(c)
+	int c;
+{
+	return (__maskrune((c), 0xFF));
+}
+
 #undef isalnum
 int
 isalnum(c)
@@ -101,6 +111,22 @@ isgraph(c)
 	return (__istype((c), _G));
 }
 
+#undef ishexnumber 
+int
+ishexnumber(c)
+	int c;
+{
+	return (__istype((c), _X));
+}
+
+#undef isideogram
+int
+isideogram(c)
+	int c;
+{
+	return (__istype((c), _I));
+}
+
 #undef islower
 int
 islower(c)
@@ -109,6 +135,22 @@ islower(c)
 	return (__istype((c), _L));
 }
 
+#undef isnumber
+int
+isnumber(c)
+	int c;
+{
+	return (__istype((c), _D));
+}
+
+#undef isphonogram	
+int
+isphonogram(c)
+	int c;
+{
+	return (__istype((c), _Q));
+}
+
 #undef isprint
 int
 isprint(c)
@@ -125,6 +167,14 @@ ispunct(c)
 	return (__istype((c), _P));
 }
 
+#undef isrune
+int
+isrune(c)
+	int c;
+{
+	return (__istype((c), 0xFFFFFF00L));
+}
+
 #undef isspace
 int
 isspace(c)
@@ -133,6 +183,14 @@ isspace(c)
 	return (__istype((c), _S));
 }
 
+#undef isspecial
+int
+isspecial(c)
+	int c;
+{
+	return (__istype((c), _T));
+}
+
 #undef isupper
 int
 isupper(c)
@@ -173,10 +231,3 @@ toupper(c)
         return (__toupper(c));
 }
 
-#undef digittoint
-int
-digittoint(c)
-	int c;
-{
-	return (__maskrune((c), 0xFF));
-}