4 files changed, 55 insertions, 17 deletions
diff --git a/ctype/Makefile b/ctype/Makefile
index edca5ccb93..a231b48a41 100644
--- a/ctype/Makefile
+++ b/ctype/Makefile
@@ -24,7 +24,7 @@ include ../Makeconfig
 
 headers	:= ctype.h
 
-routines	:= ctype ctype-extn ctype_l isctype
+routines	:= ctype ctype-c99 ctype-extn ctype-c99_l ctype_l isctype
 aux		:= ctype-info
 
 tests	:= test_ctype
diff --git a/ctype/ctype-c99.c b/ctype/ctype-c99.c
new file mode 100644
index 0000000000..2343242c48
--- /dev/null
+++ b/ctype/ctype-c99.c
@@ -0,0 +1,26 @@
+/* External function version of isblank.
+   Copyright (C) 1991-2015 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#define	__NO_CTYPE
+#include <ctype.h>
+
+int
+isblank (int c)
+{
+  return __isctype (c, _ISblank);
+}
diff --git a/ctype/ctype-c99_l.c b/ctype/ctype-c99_l.c
new file mode 100644
index 0000000000..0a2afa9f0c
--- /dev/null
+++ b/ctype/ctype-c99_l.c
@@ -0,0 +1,27 @@
+/* External function version of isblank_l.
+   Copyright (C) 1991-2015 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#define	__NO_CTYPE
+#include <ctype.h>
+
+int
+__isblank_l (int c, __locale_t l)
+{
+  return __isctype_l (c, _ISblank, l);
+}
+weak_alias (__isblank_l, isblank_l)
diff --git a/ctype/ctype-extn.c b/ctype/ctype-extn.c
index dcc9874894..0073c1a036 100644
--- a/ctype/ctype-extn.c
+++ b/ctype/ctype-extn.c
@@ -23,14 +23,7 @@
 #define __ctype_toupper \
   ((int32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TOUPPER) + 128)
 
-/* Real function versions of the non-ANSI ctype functions.  isblank is
-   now in ISO C99 but we leave it here.  */
-
-int
-isblank (int c)
-{
-  return __isctype (c, _ISblank);
-}
+/* Real function versions of the non-ANSI ctype functions.  */
 
 int
 _tolower (int c)
@@ -56,11 +49,3 @@ isascii (int c)
   return __isascii (c);
 }
 weak_alias (isascii, __isascii_l)
-
-
-int
-__isblank_l (int c, __locale_t l)
-{
-  return __isctype_l (c, _ISblank, l);
-}
-weak_alias (__isblank_l, isblank_l)