2009-06-30 Xan Lopez <xlopez@igalia.com>

        Reviewed by Jan Alonzo.

        https://bugs.webkit.org/show_bug.cgi?id=26877
        [GTK] DRT fixes to pass new plugin test

        Silence compiler warnings.

        Newer GCC don't like using or returning a static string where a
        'char*' is expected. Ideally we'd change the function signatures
        to return or take 'const char*' I suppose, but since we can't do
        that just cast the strings to 'char*'.

        * DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp:
        (webkit_test_plugin_get_value):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@45431 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 80d4fb5c7dd2b0cb8a44ddc6403f37cd7fa9b83a..948425b5e18d73a55088484153fc03cfa3830e49 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,20 @@
+2009-06-30  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Jan Alonzo.
+
+        https://bugs.webkit.org/show_bug.cgi?id=26877
+        [GTK] DRT fixes to pass new plugin test
+
+        Silence compiler warnings.
+
+        Newer GCC don't like using or returning a static string where a
+        'char*' is expected. Ideally we'd change the function signatures
+        to return or take 'const char*' I suppose, but since we can't do
+        that just cast the strings to 'char*'.
+
+        * DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp:
+        (webkit_test_plugin_get_value):
+
 2009-06-30  Xan Lopez  <xlopez@igalia.com>
 
         Reviewed by Jan Alonzo.

diff --git a/WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp b/WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp
index 760025a6de5c991f0de8dc481465d6e5ddac1c11..a58862ba43337d049a8a8179ba7959bc39ba594b 100644 (file)
--- a/WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp
@@ -227,10 +227,10 @@ webkit_test_plugin_get_value(NPP instance, NPPVariable variable, void *value)
 
     switch (variable) {
         case NPPVpluginNameString:
-            *((char **)value) = "WebKit Test PlugIn";
+            *((char **)value) = const_cast<char*>("WebKit Test PlugIn");
             break;
         case NPPVpluginDescriptionString:
-            *((char **)value) = "Simple Netscape plug-in that handles test content for WebKit";
+            *((char **)value) = const_cast<char*>("Simple Netscape plug-in that handles test content for WebKit");
             break;
         case NPPVpluginNeedsXEmbed:
             *((NPBool *)value) = TRUE;
@@ -266,7 +266,7 @@ webkit_test_plugin_set_value(NPP instance, NPNVariable variable, void *value)
 char *
 NP_GetMIMEDescription(void)
 {
-    return "application/x-webkit-test-netscape:testnetscape:test netscape content";
+    return const_cast<char*>("application/x-webkit-test-netscape:testnetscape:test netscape content");
 }
 
 NPError