[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-142-g786665c

[ariya at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 1e8509025e07408a0ff79e9a868d26623a4a0931
Author: ariya at webkit.org <ariya at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 22 18:12:26 2010 +0000

    2010-12-22  Ariya Hidayat  <ariya at sencha.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            TestNetscapePlugIn should use #if defined
            https://bugs.webkit.org/show_bug.cgi?id=51471
    
            * DumpRenderTree/TestNetscapePlugIn/main.cpp:
            (NP_Initialize):
            (NPP_New):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74482 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index a8e091e..2668a1a 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-22  Ariya Hidayat  <ariya at sencha.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        TestNetscapePlugIn should use #if defined
+        https://bugs.webkit.org/show_bug.cgi?id=51471
+
+        * DumpRenderTree/TestNetscapePlugIn/main.cpp:
+        (NP_Initialize):
+        (NPP_New):
+
 2010-12-22  Ilya Tikhonovsky  <loislo at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp b/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp
index 39a3392..b4b7fa3 100644
--- a/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp
+++ b/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp
@@ -47,7 +47,7 @@ using namespace std;
 static bool getEntryPointsWasCalled;
 static bool initializeWasCalled;
 
-#if XP_WIN
+#if defined(XP_WIN)
 #define STDCALL __stdcall
 
 static inline int strcasecmp(const char* s1, const char* s2)
@@ -73,7 +73,7 @@ NPError STDCALL NP_Initialize(NPNetscapeFuncs *browserFuncs
 {
     initializeWasCalled = true;
 
-#if XP_WIN
+#if defined(XP_WIN)
     // Simulate Flash and QuickTime's behavior of crashing when NP_Initialize is called before NP_GetEntryPoints.
     if (!getEntryPointsWasCalled)
         CRASH();
@@ -239,7 +239,7 @@ NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc
                 return NPERR_INCOMPATIBLE_VERSION_ERROR;
 #endif
         } else if (strcasecmp(argn[i], "testGetURLOnDestroy") == 0) {
-#if XP_WIN
+#if defined(XP_WIN)
             // FIXME: When https://bugs.webkit.org/show_bug.cgi?id=41831 is fixed, this #ifdef can be removed.
             obj->testGetURLOnDestroy = TRUE;
 #endif

-- 
WebKit Debian packaging