[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 50aed17a0b410549a5758e7330fad289fc133d9f
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 28 07:49:51 2011 +0000

    2011-01-27  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Maciej Stachowiak.
    
            Build fix for Mac Intel Debug after r76916
            https://bugs.webkit.org/show_bug.cgi?id=53284
    
            Fix macro redefinition by guarding the redefined macros.
    
            * config.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76922 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 545707f..4dc337f 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,16 @@
 2011-01-27  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
+        Reviewed by Maciej Stachowiak.
+
+        Build fix for Mac Intel Debug after r76916
+        https://bugs.webkit.org/show_bug.cgi?id=53284
+
+        Fix macro redefinition by guarding the redefined macros.
+
+        * config.h:
+
+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.
diff --git a/Source/WebKit2/config.h b/Source/WebKit2/config.h
index fc1ea83..379be5f 100644
--- a/Source/WebKit2/config.h
+++ b/Source/WebKit2/config.h
@@ -34,9 +34,13 @@
 #include <wtf/FastMalloc.h>
 #endif
 
-#if defined(__cplusplus) && !defined(EXTERN_C_BEGIN) && !defined(EXTERN_C_END)
+#ifdef __cplusplus
+#ifndef EXTERN_C_BEGIN
 #define EXTERN_C_BEGIN extern "C" {
+#endif
+#ifndef EXTERN_C_END
 #define EXTERN_C_END }
+#endif
 #else
 #define EXTERN_C_BEGIN
 #define EXTERN_C_END

-- 
WebKit Debian packaging