Commit 76deff73 authored by Jean-Paul Saman's avatar Jean-Paul Saman Committed by Jean-Baptiste Kempf

mozilla: fix integer types

(u)int16 -> (u)int16_t
(u)int32 -> (u)int32_t
(cherry picked from commit 53ec8a45)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 8dca1aa1
...@@ -128,14 +128,14 @@ NPN_GetURLNotify(NPP instance, const char* url, const char* window, void* notify ...@@ -128,14 +128,14 @@ NPN_GetURLNotify(NPP instance, const char* url, const char* window, void* notify
NPError NPError
NPN_PostURL(NPP instance, const char* url, const char* window, 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, return CallNPN_PostURLProc(gNetscapeFuncs.posturl, instance,
url, window, len, buf, file); url, window, len, buf, file);
} }
NPError 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) const char* buf, NPBool file, void* notifyData)
{ {
return CallNPN_PostURLNotifyProc(gNetscapeFuncs.posturlnotify, return CallNPN_PostURLNotifyProc(gNetscapeFuncs.posturlnotify,
...@@ -157,8 +157,8 @@ NPN_NewStream(NPP instance, NPMIMEType type, const char *window, ...@@ -157,8 +157,8 @@ NPN_NewStream(NPP instance, NPMIMEType type, const char *window,
type, window, stream_ptr); type, window, stream_ptr);
} }
int32 int32_t
NPN_Write(NPP instance, NPStream* stream, int32 len, void* buffer) NPN_Write(NPP instance, NPStream* stream, int32_t len, void* buffer)
{ {
return CallNPN_WriteProc(gNetscapeFuncs.write, instance, return CallNPN_WriteProc(gNetscapeFuncs.write, instance,
stream, len, buffer); stream, len, buffer);
...@@ -183,8 +183,7 @@ NPN_UserAgent(NPP instance) ...@@ -183,8 +183,7 @@ NPN_UserAgent(NPP instance)
return CallNPN_UserAgentProc(gNetscapeFuncs.uagent, instance); return CallNPN_UserAgentProc(gNetscapeFuncs.uagent, instance);
} }
void* void *NPN_MemAlloc(uint32_t size)
NPN_MemAlloc(uint32 size)
{ {
return CallNPN_MemAllocProc(gNetscapeFuncs.memalloc, size); return CallNPN_MemAllocProc(gNetscapeFuncs.memalloc, size);
} }
...@@ -194,7 +193,7 @@ void NPN_MemFree(void* ptr) ...@@ -194,7 +193,7 @@ void NPN_MemFree(void* ptr)
CallNPN_MemFreeProc(gNetscapeFuncs.memfree, ptr); CallNPN_MemFreeProc(gNetscapeFuncs.memfree, ptr);
} }
uint32 NPN_MemFlush(uint32 size) uint32_t NPN_MemFlush(uint32_t size)
{ {
return CallNPN_MemFlushProc(gNetscapeFuncs.memflush, size); return CallNPN_MemFlushProc(gNetscapeFuncs.memflush, size);
} }
...@@ -443,15 +442,15 @@ void NPN_SetException(NPObject* obj, const NPUTF8 *message) ...@@ -443,15 +442,15 @@ void NPN_SetException(NPObject* obj, const NPUTF8 *message)
***********************************************************************/ ***********************************************************************/
/* Function prototypes */ /* Function prototypes */
NPError Private_New(NPMIMEType pluginType, NPP instance, uint16 mode, NPError Private_New(NPMIMEType pluginType, NPP instance, uint16_t mode,
int16 argc, char* argn[], char* argv[], NPSavedData* saved); int16_t argc, char* argn[], char* argv[], NPSavedData* saved);
NPError Private_Destroy(NPP instance, NPSavedData** save); NPError Private_Destroy(NPP instance, NPSavedData** save);
NPError Private_SetWindow(NPP instance, NPWindow* window); NPError Private_SetWindow(NPP instance, NPWindow* window);
NPError Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPError Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream,
NPBool seekable, uint16* stype); NPBool seekable, uint16_t* stype);
int32 Private_WriteReady(NPP instance, NPStream* stream); int32_t Private_WriteReady(NPP instance, NPStream* stream);
int32 Private_Write(NPP instance, NPStream* stream, int32 offset, int32_t Private_Write(NPP instance, NPStream* stream, int32_t offset,
int32 len, void* buffer); int32_t len, void* buffer);
void Private_StreamAsFile(NPP instance, NPStream* stream, const char* fname); void Private_StreamAsFile(NPP instance, NPStream* stream, const char* fname);
NPError Private_DestroyStream(NPP instance, NPStream* stream, NPError reason); NPError Private_DestroyStream(NPP instance, NPStream* stream, NPError reason);
void Private_URLNotify(NPP instance, const char* url, void Private_URLNotify(NPP instance, const char* url,
...@@ -465,8 +464,8 @@ JRIGlobalRef Private_GetJavaClass(void); ...@@ -465,8 +464,8 @@ JRIGlobalRef Private_GetJavaClass(void);
/* function implementations */ /* function implementations */
NPError NPError
Private_New(NPMIMEType pluginType, NPP instance, uint16 mode, Private_New(NPMIMEType pluginType, NPP instance, uint16_t mode,
int16 argc, char* argn[], char* argv[], NPSavedData* saved) int16_t argc, char* argn[], char* argv[], NPSavedData* saved)
{ {
NPError ret; NPError ret;
PLUGINDEBUGSTR("New"); PLUGINDEBUGSTR("New");
...@@ -492,7 +491,7 @@ Private_SetWindow(NPP instance, NPWindow* window) ...@@ -492,7 +491,7 @@ Private_SetWindow(NPP instance, NPWindow* window)
NPError NPError
Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream, Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream,
NPBool seekable, uint16* stype) NPBool seekable, uint16_t* stype)
{ {
NPError err; NPError err;
PLUGINDEBUGSTR("NewStream"); PLUGINDEBUGSTR("NewStream");
...@@ -500,7 +499,7 @@ Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream, ...@@ -500,7 +499,7 @@ Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream,
return err; return err;
} }
int32 int32_t
Private_WriteReady(NPP instance, NPStream* stream) Private_WriteReady(NPP instance, NPStream* stream)
{ {
unsigned int result; unsigned int result;
...@@ -509,8 +508,8 @@ Private_WriteReady(NPP instance, NPStream* stream) ...@@ -509,8 +508,8 @@ Private_WriteReady(NPP instance, NPStream* stream)
return result; return result;
} }
int32 int32_t
Private_Write(NPP instance, NPStream* stream, int32 offset, int32 len, Private_Write(NPP instance, NPStream* stream, int32_t offset, int32_t len,
void* buffer) void* buffer)
{ {
unsigned int result; unsigned int result;
......
...@@ -449,7 +449,7 @@ NPError NPN_GetURL(NPP instance, const char *url, const char *target) ...@@ -449,7 +449,7 @@ NPError NPN_GetURL(NPP instance, const char *url, const char *target)
return g_pNavigatorFuncs->geturl(instance, url, target); return g_pNavigatorFuncs->geturl(instance, url, target);
} }
NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file, void* notifyData) NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file, void* notifyData)
{ {
int navMinorVers = g_pNavigatorFuncs->version & 0xFF; int navMinorVers = g_pNavigatorFuncs->version & 0xFF;
NPError err; NPError err;
...@@ -463,7 +463,7 @@ NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uin ...@@ -463,7 +463,7 @@ NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uin
} }
NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file) NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file)
{ {
return g_pNavigatorFuncs->posturl(instance, url, window, len, buf, file); return g_pNavigatorFuncs->posturl(instance, url, window, len, buf, file);
} }
...@@ -497,11 +497,11 @@ NPError NPN_NewStream(NPP instance, NPMIMEType type, ...@@ -497,11 +497,11 @@ NPError NPN_NewStream(NPP instance, NPMIMEType type,
/* Provides len bytes of data. /* Provides len bytes of data.
*/ */
int32 NPN_Write(NPP instance, NPStream *stream, int32_t NPN_Write(NPP instance, NPStream *stream,
int32 len, void *buffer) int32_t len, void *buffer)
{ {
int navMinorVersion = g_pNavigatorFuncs->version & 0xFF; int navMinorVersion = g_pNavigatorFuncs->version & 0xFF;
int32 result; int32_t result;
if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT ) { if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT ) {
result = g_pNavigatorFuncs->write(instance, stream, len, buffer); result = g_pNavigatorFuncs->write(instance, stream, len, buffer);
...@@ -546,7 +546,7 @@ const char* NPN_UserAgent(NPP instance) ...@@ -546,7 +546,7 @@ const char* NPN_UserAgent(NPP instance)
/* allocates memory from the Navigator's memory space. Necessary so that /* allocates memory from the Navigator's memory space. Necessary so that
* saved instance data may be freed by Navigator when exiting. * saved instance data may be freed by Navigator when exiting.
*/ */
void* NPN_MemAlloc(uint32 size) void *NPN_MemAlloc(uint32 size)
{ {
return g_pNavigatorFuncs->memalloc(size); return g_pNavigatorFuncs->memalloc(size);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment