Reviewed by Eric.

        - fix ASCIICType.h for some Windows compiles

        * wtf/ASCIICType.h: Check the compiler, not the OS, since it's the
        compiler/library that has the wchar_t that is just a typedef.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27164 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index e7f0c6b648d1ee409e972051ac9dc00287b433c8..bb524142f0866108f45d280bfcc01ee25240505b 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-27  Darin Adler  <darin@apple.com>
+
+        Reviewed by Eric.
+
+        - fix ASCIICType.h for some Windows compiles
+
+        * wtf/ASCIICType.h: Check the compiler, not the OS, since it's the
+        compiler/library that has the wchar_t that is just a typedef.
+
 2007-10-27  Kevin McCullough  <kmccullough@apple.com>
 
         - BuildFix
@@ -25,7 +34,7 @@
 
         Reviewed by Eric.
 
-        - a couple of Windows fixes
+        - fix pow on Windows
 
         * wtf/MathExtras.h: (wtf_pow): Add a special case for MSVC, which has
         a "pow" function that does not properly handle the case where arg1 is
@@ -34,9 +43,6 @@
         * kjs/math_object.cpp: (MathFuncImp::callAsFunction): Don't explicity
         specify "::pow" -- just "pow" is fine.
 
-        * wtf/ASCIICType.h: Check the compiler, not the OS, since it's the
-        compiler/library that has the wchar_t that is just a typedef.
-
 2007-10-27  Darin Adler  <darin@apple.com>
 
         Reviewed by Maciej.

diff --git a/JavaScriptCore/wtf/ASCIICType.h b/JavaScriptCore/wtf/ASCIICType.h
index ad0bb4990e042e132f900069fde68487f54d7f47..849b811d1feabd963aff589311eb3880eb68f562 100644 (file)
--- a/JavaScriptCore/wtf/ASCIICType.h
+++ b/JavaScriptCore/wtf/ASCIICType.h
@@ -45,49 +45,49 @@ namespace WTF {
 
     inline bool isASCIIAlpha(char c) { return (c | 0x20) >= 'a' && (c | 0x20) <= 'z'; }
     inline bool isASCIIAlpha(unsigned short c) { return (c | 0x20) >= 'a' && (c | 0x20) <= 'z'; }
-#if !PLATFORM(WIN_OS) || defined(_NATIVE_WCHAR_T_DEFINED)
+#if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
     inline bool isASCIIAlpha(wchar_t c) { return (c | 0x20) >= 'a' && (c | 0x20) <= 'z'; }
 #endif
 
     inline bool isASCIIAlphanumeric(char c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'z'; }
     inline bool isASCIIAlphanumeric(unsigned short c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'z'; }
-#if !PLATFORM(WIN_OS) || defined(_NATIVE_WCHAR_T_DEFINED)
+#if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
     inline bool isASCIIAlphanumeric(wchar_t c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'z'; }
 #endif
 
     inline bool isASCIIDigit(char c) { return c >= '0' && c <= '9'; }
     inline bool isASCIIDigit(unsigned short c) { return c >= '0' && c <= '9'; }
-#if !PLATFORM(WIN_OS) || defined(_NATIVE_WCHAR_T_DEFINED)
+#if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
     inline bool isASCIIDigit(wchar_t c) { return c >= '0' && c <= '9'; }
 #endif
 
     inline bool isASCIIHexDigit(char c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'f'; }
     inline bool isASCIIHexDigit(unsigned short c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'f'; }
-#if !PLATFORM(WIN_OS) || defined(_NATIVE_WCHAR_T_DEFINED)
+#if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
     inline bool isASCIIHexDigit(wchar_t c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'f'; }
 #endif
 
     inline bool isASCIILower(char c) { return c >= 'a' && c <= 'z'; }
     inline bool isASCIILower(unsigned short c) { return c >= 'a' && c <= 'z'; }
-#if !PLATFORM(WIN_OS) || defined(_NATIVE_WCHAR_T_DEFINED)
+#if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
     inline bool isASCIILower(wchar_t c) { return c >= 'a' && c <= 'z'; }
 #endif
 
     inline bool isASCIISpace(char c) { return c == '\t' || c == '\n' || c == '\v' || c =='\f' || c == '\r' || c == ' '; }
     inline bool isASCIISpace(unsigned short c) { return c == '\t' || c == '\n' || c == '\v' || c =='\f' || c == '\r' || c == ' '; }
-#if !PLATFORM(WIN_OS) || defined(_NATIVE_WCHAR_T_DEFINED)
+#if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
     inline bool isASCIISpace(wchar_t c) { return c == '\t' || c == '\n' || c == '\v' || c =='\f' || c == '\r' || c == ' '; }
 #endif
 
     inline char toASCIILower(char c) { return c | ((c >= 'A' && c <= 'Z') << 5); }
     inline unsigned short toASCIILower(unsigned short c) { return c | ((c >= 'A' && c <= 'Z') << 5); }
-#if !PLATFORM(WIN_OS) || defined(_NATIVE_WCHAR_T_DEFINED)
+#if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
     inline wchar_t toASCIILower(wchar_t c) { return c | ((c >= 'A' && c <= 'Z') << 5); }
 #endif
 
     inline char toASCIIUpper(char c) { return static_cast<char>(c & ~((c >= 'a' && c <= 'z') << 5)); }
     inline unsigned short toASCIIUpper(unsigned short c) { return static_cast<unsigned short>(c & ~((c >= 'a' && c <= 'z') << 5)); }
-#if !PLATFORM(WIN_OS) || defined(_NATIVE_WCHAR_T_DEFINED)
+#if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
     inline wchar_t toASCIIUpper(wchar_t c) { return static_cast<wchar_t>(c & ~((c >= 'a' && c <= 'z') << 5)); }
 #endif