Changeset e6edc8d1 in mainline for uspace/lib/posix/include/posix/ctype.h

Timestamp:

2013-07-11T19:13:37Z (11 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

67632f7

Parents:

52ff62d3 (diff), 2b3e8840 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline changes.

File:

• uspace/lib/posix/include/posix/ctype.h (modified) (2 diffs)

uspace/lib/posix/include/posix/ctype.h

@@ -37 +37 @@
 #define POSIX_CTYPE_H_
 
+#ifndef __POSIX_DEF__
+#define __POSIX_DEF__(x) x
+#endif
+
 #include "libc/ctype.h"
 
 /* Classification of Characters */
-extern int posix_isxdigit(int c);
-extern int posix_isblank(int c);
-extern int posix_iscntrl(int c);
-extern int posix_isgraph(int c);
-extern int posix_isprint(int c);
-extern int posix_ispunct(int c);
+extern int __POSIX_DEF__(isxdigit)(int c);
+extern int __POSIX_DEF__(isblank)(int c);
+extern int __POSIX_DEF__(iscntrl)(int c);
+extern int __POSIX_DEF__(isgraph)(int c);
+extern int __POSIX_DEF__(isprint)(int c);
+extern int __POSIX_DEF__(ispunct)(int c);
 
 /* Obsolete Functions and Macros */
-extern int posix_isascii(int c);
-extern int posix_toascii(int c);
+extern int __POSIX_DEF__(isascii)(int c);
+extern int __POSIX_DEF__(toascii)(int c);
 #undef _tolower
 #define _tolower(c) ((c) - 'A' + 'a')
@@ -56 +60 @@
 
 
-#ifndef LIBPOSIX_INTERNAL
-        #define isxdigit posix_isxdigit
-        #define isblank posix_isblank
-        #define iscntrl posix_iscntrl
-        #define isgraph posix_isgraph
-        #define isprint posix_isprint
-        #define ispunct posix_ispunct
-        
-        #define isascii posix_isascii
-        #define toascii posix_toascii
-#endif
 
 #endif /* POSIX_CTYPE_H_ */