Revision: 3803 http://trac.macosforge.org/projects/ruby/changeset/3803 Author: lsansonetti@apple.com Date: 2010-03-17 22:58:20 -0700 (Wed, 17 Mar 2010) Log Message: ----------- fixed the TOUPPER/TOLOWER macros Modified Paths: -------------- MacRuby/trunk/include/ruby/ruby.h Modified: MacRuby/trunk/include/ruby/ruby.h =================================================================== --- MacRuby/trunk/include/ruby/ruby.h 2010-03-18 05:34:51 UTC (rev 3802) +++ MacRuby/trunk/include/ruby/ruby.h 2010-03-18 05:58:20 UTC (rev 3803) @@ -1341,12 +1341,10 @@ #define rb_isspace(c) (rb_isascii(c) && isspace(c)) #define rb_isupper(c) (rb_isascii(c) && isupper(c)) #define rb_isxdigit(c) (rb_isascii(c) && isxdigit(c)) -#define rb_tolower(c) (rb_isascii(c) && tolower(c)) -#define rb_toupper(c) (rb_isascii(c) && toupper(c)) +#define rb_tolower(c) (rb_isascii(c) ? tolower(c) : (c)) +#define rb_toupper(c) (rb_isascii(c) ? toupper(c) : (c)) -#ifndef ISPRINT #define ISASCII(c) rb_isascii((unsigned char)(c)) -#undef ISPRINT #define ISPRINT(c) rb_isprint((unsigned char)(c)) #define ISSPACE(c) rb_isspace((unsigned char)(c)) #define ISUPPER(c) rb_isupper((unsigned char)(c)) @@ -1355,7 +1353,6 @@ #define ISALPHA(c) rb_isalpha((unsigned char)(c)) #define ISDIGIT(c) rb_isdigit((unsigned char)(c)) #define ISXDIGIT(c) rb_isxdigit((unsigned char)(c)) -#endif #define TOUPPER(c) rb_toupper((unsigned char)(c)) #define TOLOWER(c) rb_tolower((unsigned char)(c))