Fix more type issues from the npapi.h tranisition to *_t types

webkit/tools/npapi_layout_test_plugin/main.cpp

 /*
  IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in
  consideration of your agreement to the following terms, and your use, installation,
  modification or redistribution of this Apple software constitutes acceptance of these
  terms.  If you do not agree with these terms, please do not use, install, modify or
  redistribute this Apple software.
 
  In consideration of your agreement to abide by the following terms, and subject to these
  terms, Apple grants you a personal, non-exclusive license, under Apple’s copyrights in
  this original Apple software (the "Apple Software"), to use, reproduce, modify and
@@ skipping 15 matching lines @@
  IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR CONSEQUENTIAL
  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
           OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE,
  REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND
  WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR
  OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <wtf/Platform.h>
 #include "PluginObject.h"
 
 #ifdef WIN32
 #define strcasecmp _stricmp
 #define NPAPI WINAPI
 #else
 #define NPAPI
 #endif
 
@@ skipping 58 matching lines @@
 
     return NPERR_NO_ERROR;
 }
 
 EXPORT void NPAPI NP_Shutdown(void)
 {
 }
 
 static void executeScript(const PluginObject* obj, const char* script);
 
-NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16_t argc, char *argn[], char *argv[], NPSavedData *saved)
+NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char *argn[], char *argv[], NPSavedData *saved)
 {
     if (browser->version >= 14) {
         PluginObject* obj = (PluginObject*)browser->createobject(instance, getPluginClass());
 
         for (int i = 0; i < argc; i++) {
             if (strcasecmp(argn[i], "onstreamload") == 0 && !obj->onStreamLoad)
                 obj->onStreamLoad = strdup(argv[i]);
             else if (strcasecmp(argn[i], "onStreamDestroy") == 0 && !obj->onStreamDestroy)
                 obj->onStreamDestroy = strdup(argv[i]);
             else if (strcasecmp(argn[i], "onURLNotify") == 0 && !obj->onURLNotify)
@@ skipping 82 matching lines @@
 
     NPString npScript;
     npScript.UTF8Characters = script;
     npScript.UTF8Length = strlen(script);
 
     NPVariant browserResult;
     browser->evaluate(obj->npp, windowScriptObject, &npScript, &browserResult);
     browser->releasevariantvalue(&browserResult);
 }
 
-NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream *stream, NPBool seekable, uint16 *stype)
+NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream *stream, NPBool seekable, uint16_t *stype)
 {
     PluginObject* obj = static_cast<PluginObject*>(instance->pdata);
 
     if (obj->returnErrorFromNewStream)
         return NPERR_GENERIC_ERROR;
 
     obj->stream = stream;
     *stype = NP_ASFILEONLY;
 
     if (browser->version >= NPVERS_HAS_RESPONSE_HEADERS)
@@ skipping 267 matching lines @@
 EXPORT const char* NPAPI NP_GetMIMEDescription(void) {
     // The layout test LayoutTests/fast/js/navigator-mimeTypes-length.html
     // asserts that the number of mimetypes handled by plugins should be
     // greater than the number of plugins.  This isn't true if we're
     // the only plugin and we only handle one mimetype, so specify
     // multiple mimetypes here.
     return "application/x-webkit-test-netscape:testnetscape:test netscape content;"
            "application/x-webkit-test-netscape2:testnetscape2:test netscape content2";
 }
 #endif