aboutsummaryrefslogtreecommitdiff
path: root/ctype
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-08-28 08:01:11 +0000
committerUlrich Drepper <drepper@redhat.com>2002-08-28 08:01:11 +0000
commit7a5affebe810c786bfc9ef17cdc4d0bc20a1302e (patch)
treed461b7135c42ab5555bddfe4a5fa4b46a1c4ca94 /ctype
parenta3f9038c879c11344430169d6daa8fad30d4f379 (diff)
downloadglibc-7a5affebe810c786bfc9ef17cdc4d0bc20a1302e.tar
glibc-7a5affebe810c786bfc9ef17cdc4d0bc20a1302e.tar.gz
glibc-7a5affebe810c786bfc9ef17cdc4d0bc20a1302e.tar.bz2
glibc-7a5affebe810c786bfc9ef17cdc4d0bc20a1302e.zip
Prepare headers for use in ISO C++ compliant implementations.
Diffstat (limited to 'ctype')
-rw-r--r--ctype/ctype.h19
1 files changed, 14 insertions, 5 deletions
diff --git a/ctype/ctype.h b/ctype/ctype.h
index 4a8ce30d04..47fba836ca 100644
--- a/ctype/ctype.h
+++ b/ctype/ctype.h
@@ -85,6 +85,8 @@ extern __const __int32_t *__ctype_toupper; /* Case conversions. */
#define __exctype(name) extern int name (int) __THROW
+
+__BEGIN_NAMESPACE_STD
/* The following names are all functions:
int isCHARACTERISTIC(int c);
which return nonzero iff C has CHARACTERISTIC.
@@ -101,10 +103,6 @@ __exctype (isspace);
__exctype (isupper);
__exctype (isxdigit);
-#ifdef __USE_ISOC99
-__exctype (isblank);
-#endif
-
/* Return the lowercase version of C. */
extern int tolower (int __c) __THROW;
@@ -112,6 +110,17 @@ extern int tolower (int __c) __THROW;
/* Return the uppercase version of C. */
extern int toupper (int __c) __THROW;
+__END_NAMESPACE_STD
+
+
+/* ISO C99 introduced one new function. */
+#ifdef __USE_ISOC99
+__BEGIN_NAMESPACE_C99
+
+__exctype (isblank);
+
+__END_NAMESPACE_C99
+#endif
#if defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN
@@ -147,7 +156,7 @@ __exctype (_tolower);
__res = a[(int) (c)]; \
__res; }))
-#ifndef __NO_CTYPE
+#if !defined __NO_CTYPE && !defined __cplusplus
# define isalnum(c) __isctype((c), _ISalnum)
# define isalpha(c) __isctype((c), _ISalpha)
# define iscntrl(c) __isctype((c), _IScntrl)