From 21939df44de1705786c545cd1bf519d47250322d Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 11 May 2010 18:35:50 +0100
Subject: Merge Webkit at r58956: Initial merge by Git.

Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
---
 .../DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp')

diff --git a/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp b/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp
index a3c6773..e960a06 100644
--- a/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp
+++ b/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp
@@ -171,7 +171,7 @@ webkit_test_plugin_new_stream(NPP instance,
                               NPMIMEType /*type*/,
                               NPStream *stream,
                               NPBool /*seekable*/,
-                              uint16* stype)
+                              uint16_t* stype)
 {
     PluginObject* obj = static_cast<PluginObject*>(instance->pdata);
     obj->stream = stream;
@@ -210,13 +210,13 @@ webkit_test_plugin_stream_as_file(NPP /*instance*/, NPStream* /*stream*/, const
 {
 }
 
-static int32
+static int32_t
 webkit_test_plugin_write_ready(NPP /*instance*/, NPStream* /*stream*/)
 {
     return 0;
 }
 
-static int32
+static int32_t
 webkit_test_plugin_write(NPP /*instance*/,
                          NPStream* /*stream*/,
                          int32_t /*offset*/,
-- 
cgit v1.1