safari: integer type cleanup

projects/mozilla/support/npmac.cpp

@@ -157,7 +157,7 @@ static inline void* SetupFPtoTVGlue(TFPtoTVGlue* functionGlue, void* fp)
 
 // glue for mapping netscape TVectors to Macho function pointers
 struct TTVtoFPGlue {
-    uint32 glue[6];
+    uint32_t glue[6];
 };
 
 static struct {
@@ -276,7 +276,7 @@ NPError NPN_GetURL(NPP instance, const char* url, const char* window)
     return CallNPN_GetURLProc(gNetscapeFuncs.geturl, instance, url, window);
 }
 
-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 = gNetscapeFuncs.version & 0xFF;
     NPError err;
@@ -293,7 +293,7 @@ NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uin
     return err;
 }
 
-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 CallNPN_PostURLProc(gNetscapeFuncs.posturl, instance, url, window, len, buf, file);
 }
@@ -319,7 +319,7 @@ NPError NPN_NewStream(NPP instance, NPMIMEType type, const char* window, NPStrea
     return err;
 }
 
-int32 NPN_Write(NPP instance, NPStream* stream, int32 len, void* buffer)
+int32_t NPN_Write(NPP instance, NPStream* stream, int32_t len, void* buffer)
 {
     int navMinorVers = gNetscapeFuncs.version & 0xFF;
     NPError err;
@@ -361,7 +361,7 @@ const char* NPN_UserAgent(NPP instance)
     return CallNPN_UserAgentProc(gNetscapeFuncs.uagent, instance);
 }
 
-void* NPN_MemAlloc(uint32 size)
+void* NPN_MemAlloc(uint32_t size)
 {
     return CallNPN_MemAllocProc(gNetscapeFuncs.memalloc, size);
 }
@@ -371,7 +371,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);
 }
@@ -618,18 +618,18 @@ void NPN_SetException(NPObject *npobj, const NPUTF8 *message)
 
 NPError     Private_Initialize(void);
 void        Private_Shutdown(void);
-NPError     Private_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char* argn[], char* argv[], NPSavedData* saved);
+NPError     Private_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved);
 NPError     Private_Destroy(NPP instance, NPSavedData** save);
 NPError     Private_SetWindow(NPP instance, NPWindow* window);
 NPError     Private_GetValue( NPP instance, NPPVariable variable, void *value );
 NPError     Private_SetValue( NPP instance, NPPVariable variable, void *value );
-NPError     Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16* stype);
+NPError     Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t* stype);
 NPError     Private_DestroyStream(NPP instance, NPStream* stream, NPError reason);
-int32       Private_WriteReady(NPP instance, NPStream* stream);
-int32       Private_Write(NPP instance, NPStream* stream, int32 offset, int32 len, void* buffer);
+int32_t     Private_WriteReady(NPP instance, NPStream* stream);
+int32_t     Private_Write(NPP instance, NPStream* stream, int32_t offset, int32_t len, void* buffer);
 void        Private_StreamAsFile(NPP instance, NPStream* stream, const char* fname);
 void        Private_Print(NPP instance, NPPrint* platformPrint);
-int16       Private_HandleEvent(NPP instance, void* event);
+int16_t     Private_HandleEvent(NPP instance, void* event);
 void        Private_URLNotify(NPP instance, const char* url, NPReason reason, void* notifyData);
 jobject     Private_GetJavaClass(void);
 
@@ -657,7 +657,7 @@ void Private_Shutdown(void)
     ExitCodeResource();
 }
 
-NPError    Private_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char* argn[], char* argv[], NPSavedData* saved)
+NPError    Private_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved)
 {
     EnterCodeResource();
     NPError ret = NPP_New(pluginType, instance, mode, argc, argn, argv, saved);
@@ -706,7 +706,7 @@ NPError Private_SetValue( NPP instance, NPNVariable variable, void *value )
     return err;
 }
 
-NPError Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16* stype)
+NPError Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t* stype)
 {
     NPError err;
     EnterCodeResource();
@@ -716,9 +716,9 @@ NPError Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBoo
     return err;
 }
 
-int32 Private_WriteReady(NPP instance, NPStream* stream)
+int32_t Private_WriteReady(NPP instance, NPStream* stream)
 {
-    int32 result;
+    int32_t result;
     EnterCodeResource();
     PLUGINDEBUGSTR("\pWriteReady;g;");
     result = NPP_WriteReady(instance, stream);
@@ -726,9 +726,9 @@ int32 Private_WriteReady(NPP instance, NPStream* stream)
     return result;
 }
 
-int32 Private_Write(NPP instance, NPStream* stream, int32 offset, int32 len, void* buffer)
+int32_t Private_Write(NPP instance, NPStream* stream, int32_t offset, int32_t len, void* buffer)
 {
-    int32 result;
+    int32_t result;
     EnterCodeResource();
     PLUGINDEBUGSTR("\pWrite;g;");
     result = NPP_Write(instance, stream, offset, len, buffer);
@@ -754,9 +754,9 @@ NPError Private_DestroyStream(NPP instance, NPStream* stream, NPError reason)
     return err;
 }
 
-int16 Private_HandleEvent(NPP instance, void* event)
+int16_t Private_HandleEvent(NPP instance, void* event)
 {
-    int16 result;
+    int16_t result;
     EnterCodeResource();
     PLUGINDEBUGSTR("\pHandleEvent;g;");
     result = NPP_HandleEvent(instance, event);