diff options
author | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 11:46:31 -0800 |
---|---|---|
committer | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 11:51:37 -0800 |
commit | f757db2d319ccc5f7034165046fb2bb58901afb1 (patch) | |
tree | 7dc465febb3a802d3f0e8856fcda856b13b04c0a /libc/sysdeps/linux/common/bits/uClibc_ctype.h | |
parent | 76c0c0ed99f74b8a5965be6e1c6a0c0e7a72513c (diff) | |
parent | b71274eebd68b7c68ab95c856f8075bdf4524cd7 (diff) |
Merge remote branch 'origin/master' into nptl_merge
Conflicts:
Rules.mak
libc/misc/sysvipc/msgq.c
test/Rules.mak
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libc/sysdeps/linux/common/bits/uClibc_ctype.h')
-rw-r--r-- | libc/sysdeps/linux/common/bits/uClibc_ctype.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libc/sysdeps/linux/common/bits/uClibc_ctype.h b/libc/sysdeps/linux/common/bits/uClibc_ctype.h index 43371286b..22d2df03a 100644 --- a/libc/sysdeps/linux/common/bits/uClibc_ctype.h +++ b/libc/sysdeps/linux/common/bits/uClibc_ctype.h @@ -103,12 +103,14 @@ __BEGIN_DECLS /* Now some non-ansi/iso c99 macros. */ +#ifndef __UCLIBC_SUSV4_LEGACY__ #define __isascii(c) (((c) & ~0x7f) == 0) #define __toascii(c) ((c) & 0x7f) /* Works correctly *only* on lowercase letters! */ #define _toupper(c) ((c) ^ 0x20) /* Works correctly *only* on letters (of any case) and numbers */ #define _tolower(c) ((c) | 0x20) +#endif __END_DECLS |