diff options
Diffstat (limited to 'np_sdk/mozsrc/npunix.c')
| -rw-r--r-- | np_sdk/mozsrc/npunix.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/np_sdk/mozsrc/npunix.c b/np_sdk/mozsrc/npunix.c index 55d0fa5316d2..19ae47a6f0c5 100644 --- a/np_sdk/mozsrc/npunix.c +++ b/np_sdk/mozsrc/npunix.c @@ -130,14 +130,14 @@ NPN_GetURLNotify(NPP instance, const char* url, const char* window, void* notify NPError NPN_PostURL(NPP instance, const char* url, const char* window, - uint32 len, const char* buf, NPBool file) + uint32_t len, const char* buf, NPBool file) { return CallNPN_PostURLProc(gNetscapeFuncs.posturl, instance, url, window, len, buf, file); } NPError -NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32 len, +NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file, void* notifyData) { return CallNPN_PostURLNotifyProc(gNetscapeFuncs.posturlnotify, @@ -159,8 +159,8 @@ NPN_NewStream(NPP instance, NPMIMEType type, const char *window, type, window, stream_ptr); } -int32 -NPN_Write(NPP instance, NPStream* stream, int32 len, void* buffer) +int32_t +NPN_Write(NPP instance, NPStream* stream, int32_t len, void* buffer) { return CallNPN_WriteProc(gNetscapeFuncs.write, instance, stream, len, buffer); @@ -186,7 +186,7 @@ NPN_UserAgent(NPP instance) } void* -NPN_MemAlloc(uint32 size) +NPN_MemAlloc(uint32_t size) { return CallNPN_MemAllocProc(gNetscapeFuncs.memalloc, size); } @@ -196,7 +196,7 @@ void NPN_MemFree(void* ptr) CallNPN_MemFreeProc(gNetscapeFuncs.memfree, ptr); } -uint32 NPN_MemFlush(uint32 size) +uint32_t NPN_MemFlush(uint32_t size) { return CallNPN_MemFlushProc(gNetscapeFuncs.memflush, size); } @@ -251,8 +251,8 @@ NPN_ForceRedraw(NPP instance) ***********************************************************************/ NPError -Private_New(NPMIMEType pluginType, NPP instance, uint16 mode, - int16 argc, char* argn[], char* argv[], NPSavedData* saved) +Private_New(NPMIMEType pluginType, NPP instance, uint16_t mode, + int16_t argc, char* argn[], char* argv[], NPSavedData* saved) { NPError ret; PLUGINDEBUGSTR("New"); @@ -278,7 +278,7 @@ Private_SetWindow(NPP instance, NPWindow* window) NPError Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream, - NPBool seekable, uint16* stype) + NPBool seekable, uint16_t* stype) { NPError err; PLUGINDEBUGSTR("NewStream"); @@ -286,7 +286,7 @@ Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream, return err; } -int32 +int32_t Private_WriteReady(NPP instance, NPStream* stream) { unsigned int result; @@ -295,8 +295,8 @@ Private_WriteReady(NPP instance, NPStream* stream) return result; } -int32 -Private_Write(NPP instance, NPStream* stream, int32 offset, int32 len, +int32_t +Private_Write(NPP instance, NPStream* stream, int32_t offset, int32_t len, void* buffer) { unsigned int result; @@ -483,7 +483,7 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs) pluginFuncs->javaClass = Private_GetJavaClass(); #endif - err = NPP_Initialize(); + err = NPERR_NO_ERROR; } return err; @@ -496,10 +496,8 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs) * the last object of this kind has been destroyed. * */ -NPError +void NP_Shutdown(void) { PLUGINDEBUGSTR("NP_Shutdown"); - NPP_Shutdown(); - return NPERR_NO_ERROR; } |