[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[laszlo.1.gombos at nokia.com]

The following commit has been merged in the webkit-1.3 branch:
commit a21619cb49b629fe18e5b149a3a8f9b5ca1f1a1b
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 28 07:25:26 2011 +0000

    2011-01-27  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Unreviewed build fix for Mac Intel Debug after r76916.
    
            Fix macro redefinition by guarding the redefined macros.
    
            Check if the macro is already defined before defininig it.
            c++config.h has the same macros with the same values.
    
            * config.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76921 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 63f6ea9..545707f 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,16 @@
 2011-01-27  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
+        Unreviewed build fix for Mac Intel Debug after r76916.
+
+        Fix macro redefinition by guarding the redefined macros.
+
+        Check if the macro is already defined before defininig it.
+        c++config.h has the same macros with the same values.
+
+        * config.h:
+
+2011-01-27  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
         Reviewed by Adam Barth.
 
         Update the expected results for test-webkitpy after r76916.
diff --git a/Source/WebKit2/config.h b/Source/WebKit2/config.h
index dbb9414..fc1ea83 100644
--- a/Source/WebKit2/config.h
+++ b/Source/WebKit2/config.h
@@ -34,7 +34,7 @@
 #include <wtf/FastMalloc.h>
 #endif
 
-#ifdef __cplusplus
+#if defined(__cplusplus) && !defined(EXTERN_C_BEGIN) && !defined(EXTERN_C_END)
 #define EXTERN_C_BEGIN extern "C" {
 #define EXTERN_C_END }
 #else

-- 
WebKit Debian packaging