[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 07ef3094ec2b522ffb2c367fed0e6e8d66b1d4db
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 29 16:13:56 2010 +0000

    2010-07-29  Csaba Osztrogonác  <ossy at webkit.org>
    
            Reviewed by Antonio Gomes.
    
            Warning fix on platforms where XP_MACOSX is undefined.
            https://bugs.webkit.org/show_bug.cgi?id=43192
    
            * DumpRenderTree/TestNetscapePlugIn/PluginObject.h:
            Use #if defined(XP_MACOSX) instead of #if XP_MACOSX .
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64282 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index cb2ad86..469d5af 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-29  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        Warning fix on platforms where XP_MACOSX is undefined.
+        https://bugs.webkit.org/show_bug.cgi?id=43192
+
+        * DumpRenderTree/TestNetscapePlugIn/PluginObject.h:
+        Use #if defined(XP_MACOSX) instead of #if XP_MACOSX .
+
 2010-07-29  Adam Roben  <aroben at apple.com>
 
         Give find-included-framework-headers our standard license
diff --git a/WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginObject.h b/WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginObject.h
index 03befb0..645c81c 100644
--- a/WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginObject.h
+++ b/WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginObject.h
@@ -25,7 +25,7 @@
 
 #include <WebKit/npfunctions.h>
 
-#if XP_MACOSX
+#if defined(XP_MACOSX)
 #if !defined(MAC_OS_X_VERSION_10_5) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
 #define BUILDING_ON_TIGER 1
 #elif !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
@@ -66,7 +66,7 @@ typedef struct {
 #ifdef XP_MACOSX
     NPEventModel eventModel;
 #endif
-#if XP_MACOSX && !defined(BUILDING_ON_TIGER)
+#if defined(XP_MACOSX) && !defined(BUILDING_ON_TIGER)
     void* coreAnimationLayer;
 #endif
     NPWindow lastWindow;
@@ -80,7 +80,7 @@ extern void pluginLog(NPP instance, const char* format, ...);
 extern bool testDocumentOpen(NPP npp);
 extern bool testWindowOpen(NPP npp);
 
-#if XP_MACOSX && !defined(BUILDING_ON_TIGER)
+#if defined(XP_MACOSX) && !defined(BUILDING_ON_TIGER)
 extern void* createCoreAnimationLayer();
 #endif
 

-- 
WebKit Debian packaging