[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[mjs at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 25dacba6b6a42a49fddd07402fdd735d268361b0
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 4 12:01:40 2010 +0000

    2010-01-04  Maciej Stachowiak  <mjs at apple.com>
    
            Reviewed by Adam Barth.
    
            Document CPU() macros in comments.
            https://bugs.webkit.org/show_bug.cgi?id=33147
    
            * wtf/Platform.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52730 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 8f58302..dacacec 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Adam Barth.
 
+        Document CPU() macros in comments.
+        https://bugs.webkit.org/show_bug.cgi?id=33147
+
+        * wtf/Platform.h:
+
+2010-01-04  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Adam Barth.
+
         Reorganize, document and rename CPU() platform macros.
         https://bugs.webkit.org/show_bug.cgi?id=33145
         ExecutableAllocatorSymbian appears to have buggy ARM version check
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index f0fc835..64ae3af 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -57,8 +57,8 @@
 
 /* ==== COMPILER() - the compiler being used to build the project ==== */
 
-/* COMPILER(MSVC) */
-/* COMPILER(MSVC7) */
+/* COMPILER(MSVC) Microsoft Visual C++ */
+/* COMPILER(MSVC7) Microsoft Visual C++ v7 or lower*/
 #if defined(_MSC_VER)
 #define WTF_COMPILER_MSVC 1
 #if _MSC_VER < 1400
@@ -66,24 +66,24 @@
 #endif
 #endif
 
-/* COMPILER(RVCT) */
+/* COMPILER(RVCT)  - ARM RealView Compilation Tools */
 #if defined(__CC_ARM) || defined(__ARMCC__)
 #define WTF_COMPILER_RVCT 1
 #endif
 
-/* COMPILER(GCC) */
+/* COMPILER(GCC) - GNU Compiler Collection */
 /* --gnu option of the RVCT compiler also defines __GNUC__ */
 #if defined(__GNUC__) && !COMPILER(RVCT)
 #define WTF_COMPILER_GCC 1
 #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
 #endif
 
-/* COMPILER(MINGW) */
+/* COMPILER(MINGW) - MinGW GCC */
 #if defined(MINGW) || defined(__MINGW32__)
 #define WTF_COMPILER_MINGW 1
 #endif
 
-/* COMPILER(WINSCW) */
+/* COMPILER(WINSCW) - CodeWarrior for Symbian emulator */
 #if defined(__WINSCW__)
 #define WTF_COMPILER_WINSCW 1
 #endif

-- 
WebKit Debian packaging