diff options
| -rw-r--r-- | browser-plugin/glue.cpp | 40 | ||||
| -rw-r--r-- | browser-plugin/plugin.h | 2 | ||||
| -rw-r--r-- | browser-plugin/scriptable.cpp | 2 |
3 files changed, 22 insertions, 22 deletions
diff --git a/browser-plugin/glue.cpp b/browser-plugin/glue.cpp index e0a72ab..61f3880 100644 --- a/browser-plugin/glue.cpp +++ b/browser-plugin/glue.cpp @@ -150,7 +150,7 @@ NP_Shutdown (void) NPError NPP_NewStream (NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, - uint16* stype) + uint16_t* stype) { *stype = NP_ASFILEONLY; @@ -163,14 +163,14 @@ NPP_DestroyStream (NPP instance, NPStream* stream, NPReason reason) return NPERR_NO_ERROR; } -int32 +int32_t NPP_WriteReady (NPP instance, NPStream* stream) { return -1; } -int32 NPP_Write (NPP instance, NPStream* stream, - int32 offset, int32 len, void* buffer) +int32_t NPP_Write (NPP instance, NPStream* stream, + int32_t offset, int32_t len, void* buffer) { return -1; } @@ -190,7 +190,7 @@ void NPP_Print (NPP instance, NPPrint* platformPrint) { } -int16 NPP_HandleEvent (NPP instance, void* event) +int16_t NPP_HandleEvent (NPP instance, void* event) { return FALSE; } @@ -242,7 +242,7 @@ NPP_GetValue(NPP instance, NPPVariable variable, void *value) switch (variable) { case NPPVpluginNeedsXEmbed: - *(PRBool *)value = PR_TRUE; + *(bool *)value = TRUE; break; case NPPVpluginScriptableNPObject: *(NPObject **)value = plugin->GetScriptableNPObject (); @@ -329,7 +329,7 @@ const char* NPN_UserAgent(NPP instance) return NPNFuncs.uagent (instance); } -void* NPN_MemAlloc (uint32 size) +void* NPN_MemAlloc (uint32_t size) { return NPNFuncs.memalloc (size); } @@ -354,14 +354,14 @@ void NPN_ReloadPlugins (NPBool reloadPages) NPNFuncs.reloadplugins (reloadPages); } -JRIEnv* NPN_GetJavaEnv (void) +void* NPN_GetJavaEnv (void) { - return (JRIEnv *)NPNFuncs.getJavaEnv (); + return (void *)NPNFuncs.getJavaEnv (); } -jref NPN_GetJavaPeer (NPP instance) +void* NPN_GetJavaPeer (NPP instance) { - return (jref)NPNFuncs.getJavaPeer (instance); + return (void *)NPNFuncs.getJavaPeer (instance); } NPError NPN_GetValue (NPP instance, NPNVariable variable, void *value) @@ -502,18 +502,18 @@ void NPN_SetException (NPObject *obj, const NPUTF8 *message) NPNFuncs.setexception (obj, message); } -void* NPN_MemDup (const void *aMem, uint32 aLen) +void* NPN_MemDup (const void *aMem, uint32_t aLen) { - if (!aMem || !aLen) { - return NULL; - } + if (!aMem || !aLen) { + return NULL; + } - void *dup = NPN_MemAlloc (aLen); - if (!dup) { - return NULL; - } + void *dup = NPN_MemAlloc (aLen); + if (!dup) { + return NULL; + } - return memcpy (dup, aMem, aLen); + return memcpy (dup, aMem, aLen); } char* NPN_StrDup (const char *aString) diff --git a/browser-plugin/plugin.h b/browser-plugin/plugin.h index 75b60ee..0d037e5 100644 --- a/browser-plugin/plugin.h +++ b/browser-plugin/plugin.h @@ -82,7 +82,7 @@ class Plugin { bool mCanFindOnPage; }; -void* NPN_MemDup (const void *aMem, uint32 aLen); +void* NPN_MemDup (const void *aMem, uint32_t aLen); char* NPN_StrDup (const char *aString); #endif // __PLUGIN_H__ diff --git a/browser-plugin/scriptable.cpp b/browser-plugin/scriptable.cpp index 4ffe57e..1326d4a 100644 --- a/browser-plugin/scriptable.cpp +++ b/browser-plugin/scriptable.cpp @@ -361,7 +361,7 @@ ScriptablePluginObject::Invoke (NPIdentifier name, const NPVariant *args, if (argCount < 1 || !NPVARIANT_IS_STRING (args[0])) { return false; } - plugin->Find (NPVARIANT_TO_STRING (args[0]).utf8characters); + plugin->Find (NPVARIANT_TO_STRING (args[0]).UTF8Characters); return true; } else if (name == mFindNextID) { plugin->FindNext (); |