1 files changed, 184 insertions, 184 deletions

diff --git a/np_sdk/mozsrc/npupp.h b/np_sdk/mozsrc/npupp.h
index 6d433f1afb00..9cf63e12c571 100644
--- a/np_sdk/mozsrc/npupp.h
+++ b/np_sdk/mozsrc/npupp.h
@@ -14,7 +14,7 @@
  *
  * The Original Code is mozilla.org code.
  *
- * The Initial Developer of the Original Code is
+ * The Initial Developer of the Original Code is 
  * Netscape Communications Corporation.
  * Portions created by the Initial Developer are Copyright (C) 1998
  * the Initial Developer. All Rights Reserved.
@@ -79,21 +79,21 @@ typedef UniversalProcPtr NPP_InitializeUPP;
 
 enum {
     uppNPP_InitializeProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(0))
+        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(0))		
         | RESULT_SIZE(SIZE_CODE(0))
 };
 
-#define NewNPP_InitializeProc(FUNC)     \
+#define NewNPP_InitializeProc(FUNC)		\
         (NPP_InitializeUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_InitializeProcInfo, GetCurrentArchitecture())
-#define CallNPP_InitializeProc(FUNC)        \
+#define CallNPP_InitializeProc(FUNC)		\
         (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_InitializeProcInfo)
-
+        
 #else
 
 typedef void (* NP_LOADDS NPP_InitializeUPP)(void);
-#define NewNPP_InitializeProc(FUNC)     \
+#define NewNPP_InitializeProc(FUNC)		\
         ((NPP_InitializeUPP) (FUNC))
-#define CallNPP_InitializeProc(FUNC)        \
+#define CallNPP_InitializeProc(FUNC)		\
         (*(FUNC))()
 
 #endif
@@ -106,21 +106,21 @@ typedef UniversalProcPtr NPP_ShutdownUPP;
 
 enum {
     uppNPP_ShutdownProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(0))
+        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(0))		
         | RESULT_SIZE(SIZE_CODE(0))
 };
 
-#define NewNPP_ShutdownProc(FUNC)       \
+#define NewNPP_ShutdownProc(FUNC)		\
         (NPP_ShutdownUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_ShutdownProcInfo, GetCurrentArchitecture())
-#define CallNPP_ShutdownProc(FUNC)      \
+#define CallNPP_ShutdownProc(FUNC)		\
         (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_ShutdownProcInfo)
-
+        
 #else
 
 typedef void (* NP_LOADDS NPP_ShutdownUPP)(void);
-#define NewNPP_ShutdownProc(FUNC)       \
+#define NewNPP_ShutdownProc(FUNC)		\
         ((NPP_ShutdownUPP) (FUNC))
-#define CallNPP_ShutdownProc(FUNC)      \
+#define CallNPP_ShutdownProc(FUNC)		\
         (*(FUNC))()
 
 #endif
@@ -143,17 +143,17 @@ enum {
         | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
 };
 
-#define NewNPP_NewProc(FUNC)        \
+#define NewNPP_NewProc(FUNC)		\
         (NPP_NewUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_NewProcInfo, GetCurrentArchitecture())
 #define CallNPP_NewProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7) \
         (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_NewProcInfo, \
                                    (ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7))
 #else
 
-typedef NPError (* NP_LOADDS NPP_NewUPP)(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char* argn[], char* argv[], NPSavedData* saved);
-#define NewNPP_NewProc(FUNC)        \
+typedef NPError	(* NP_LOADDS NPP_NewUPP)(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char* argn[], char* argv[], NPSavedData* saved);
+#define NewNPP_NewProc(FUNC)		\
         ((NPP_NewUPP) (FUNC))
-#define CallNPP_NewProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7)     \
+#define CallNPP_NewProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7)		\
         (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7))
 
 #endif
@@ -170,16 +170,16 @@ enum {
         | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPSavedData **)))
         | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
 };
-#define NewNPP_DestroyProc(FUNC)        \
+#define NewNPP_DestroyProc(FUNC)		\
         (NPP_DestroyUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_DestroyProcInfo, GetCurrentArchitecture())
-#define CallNPP_DestroyProc(FUNC, ARG1, ARG2)       \
+#define CallNPP_DestroyProc(FUNC, ARG1, ARG2)		\
         (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_DestroyProcInfo, (ARG1), (ARG2))
 #else
 
-typedef NPError (* NP_LOADDS NPP_DestroyUPP)(NPP instance, NPSavedData** save);
-#define NewNPP_DestroyProc(FUNC)        \
+typedef NPError	(* NP_LOADDS NPP_DestroyUPP)(NPP instance, NPSavedData** save);
+#define NewNPP_DestroyProc(FUNC)		\
         ((NPP_DestroyUPP) (FUNC))
-#define CallNPP_DestroyProc(FUNC, ARG1, ARG2)       \
+#define CallNPP_DestroyProc(FUNC, ARG1, ARG2)		\
         (*(FUNC))((ARG1), (ARG2))
 
 #endif
@@ -196,17 +196,17 @@ enum {
         | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPWindow *)))
         | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
 };
-#define NewNPP_SetWindowProc(FUNC)      \
+#define NewNPP_SetWindowProc(FUNC)		\
         (NPP_SetWindowUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_SetWindowProcInfo, GetCurrentArchitecture())
-#define CallNPP_SetWindowProc(FUNC, ARG1, ARG2)     \
+#define CallNPP_SetWindowProc(FUNC, ARG1, ARG2)		\
         (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_SetWindowProcInfo, (ARG1), (ARG2))
 
 #else
 
-typedef NPError (* NP_LOADDS NPP_SetWindowUPP)(NPP instance, NPWindow* window);
-#define NewNPP_SetWindowProc(FUNC)      \
+typedef NPError	(* NP_LOADDS NPP_SetWindowUPP)(NPP instance, NPWindow* window);
+#define NewNPP_SetWindowProc(FUNC)		\
         ((NPP_SetWindowUPP) (FUNC))
-#define CallNPP_SetWindowProc(FUNC, ARG1, ARG2)     \
+#define CallNPP_SetWindowProc(FUNC, ARG1, ARG2)		\
         (*(FUNC))((ARG1), (ARG2))
 
 #endif
@@ -226,14 +226,14 @@ enum {
         | STACK_ROUTINE_PARAMETER(5, SIZE_CODE(sizeof(uint16 *)))
         | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
 };
-#define NewNPP_NewStreamProc(FUNC)      \
+#define NewNPP_NewStreamProc(FUNC)		\
         (NPP_NewStreamUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_NewStreamProcInfo, GetCurrentArchitecture())
-#define CallNPP_NewStreamProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5)       \
+#define CallNPP_NewStreamProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5)		\
         (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_NewStreamProcInfo, (ARG1), (ARG2), (ARG3), (ARG4), (ARG5))
 #else
 
-typedef NPError (* NP_LOADDS NPP_NewStreamUPP)(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16* stype);
-#define NewNPP_NewStreamProc(FUNC)      \
+typedef NPError	(* NP_LOADDS NPP_NewStreamUPP)(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16* stype);
+#define NewNPP_NewStreamProc(FUNC)		\
         ((NPP_NewStreamUPP) (FUNC))
 #define CallNPP_NewStreamProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5) \
         (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5))
@@ -252,17 +252,17 @@ enum {
         | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(NPReason)))
         | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
 };
-#define NewNPP_DestroyStreamProc(FUNC)      \
+#define NewNPP_DestroyStreamProc(FUNC)		\
         (NPP_DestroyStreamUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_DestroyStreamProcInfo, GetCurrentArchitecture())
-#define CallNPP_DestroyStreamProc(FUNC,  NPParg, NPStreamPtr, NPReasonArg)      \
+#define CallNPP_DestroyStreamProc(FUNC,  NPParg, NPStreamPtr, NPReasonArg)		\
         (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_DestroyStreamProcInfo, (NPParg), (NPStreamPtr), (NPReasonArg))
 
 #else
 
-typedef NPError (* NP_LOADDS NPP_DestroyStreamUPP)(NPP instance, NPStream* stream, NPReason reason);
-#define NewNPP_DestroyStreamProc(FUNC)      \
+typedef NPError	(* NP_LOADDS NPP_DestroyStreamUPP)(NPP instance, NPStream* stream, NPReason reason);
+#define NewNPP_DestroyStreamProc(FUNC)		\
         ((NPP_DestroyStreamUPP) (FUNC))
-#define CallNPP_DestroyStreamProc(FUNC,  NPParg, NPStreamPtr, NPReasonArg)      \
+#define CallNPP_DestroyStreamProc(FUNC,  NPParg, NPStreamPtr, NPReasonArg)		\
         (*(FUNC))((NPParg), (NPStreamPtr), (NPReasonArg))
 
 #endif
@@ -279,17 +279,17 @@ enum {
         | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPStream *)))
         | RESULT_SIZE(SIZE_CODE(sizeof(int32)))
 };
-#define NewNPP_WriteReadyProc(FUNC)     \
+#define NewNPP_WriteReadyProc(FUNC)		\
         (NPP_WriteReadyUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_WriteReadyProcInfo, GetCurrentArchitecture())
-#define CallNPP_WriteReadyProc(FUNC,  NPParg, NPStreamPtr)      \
+#define CallNPP_WriteReadyProc(FUNC,  NPParg, NPStreamPtr)		\
         (int32)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_WriteReadyProcInfo, (NPParg), (NPStreamPtr))
 
 #else
 
 typedef int32 (* NP_LOADDS NPP_WriteReadyUPP)(NPP instance, NPStream* stream);
-#define NewNPP_WriteReadyProc(FUNC)     \
+#define NewNPP_WriteReadyProc(FUNC)		\
         ((NPP_WriteReadyUPP) (FUNC))
-#define CallNPP_WriteReadyProc(FUNC,  NPParg, NPStreamPtr)      \
+#define CallNPP_WriteReadyProc(FUNC,  NPParg, NPStreamPtr)		\
         (*(FUNC))((NPParg), (NPStreamPtr))
 
 #endif
@@ -309,17 +309,17 @@ enum {
         | STACK_ROUTINE_PARAMETER(5, SIZE_CODE(sizeof(void*)))
         | RESULT_SIZE(SIZE_CODE(sizeof(int32)))
 };
-#define NewNPP_WriteProc(FUNC)      \
+#define NewNPP_WriteProc(FUNC)		\
         (NPP_WriteUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_WriteProcInfo, GetCurrentArchitecture())
-#define CallNPP_WriteProc(FUNC,  NPParg, NPStreamPtr, offsetArg, lenArg, bufferPtr)     \
+#define CallNPP_WriteProc(FUNC,  NPParg, NPStreamPtr, offsetArg, lenArg, bufferPtr)		\
         (int32)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_WriteProcInfo, (NPParg), (NPStreamPtr), (offsetArg), (lenArg), (bufferPtr))
 
 #else
 
 typedef int32 (* NP_LOADDS NPP_WriteUPP)(NPP instance, NPStream* stream, int32 offset, int32 len, void* buffer);
-#define NewNPP_WriteProc(FUNC)      \
+#define NewNPP_WriteProc(FUNC)		\
         ((NPP_WriteUPP) (FUNC))
-#define CallNPP_WriteProc(FUNC,  NPParg, NPStreamPtr, offsetArg, lenArg, bufferPtr)     \
+#define CallNPP_WriteProc(FUNC,  NPParg, NPStreamPtr, offsetArg, lenArg, bufferPtr)		\
         (*(FUNC))((NPParg), (NPStreamPtr), (offsetArg), (lenArg), (bufferPtr))
 
 #endif
@@ -337,17 +337,17 @@ enum {
         | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(const char *)))
         | RESULT_SIZE(SIZE_CODE(0))
 };
-#define NewNPP_StreamAsFileProc(FUNC)       \
+#define NewNPP_StreamAsFileProc(FUNC)		\
         (NPP_StreamAsFileUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_StreamAsFileProcInfo, GetCurrentArchitecture())
-#define CallNPP_StreamAsFileProc(FUNC, ARG1, ARG2, ARG3)        \
+#define CallNPP_StreamAsFileProc(FUNC, ARG1, ARG2, ARG3)		\
         (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_StreamAsFileProcInfo, (ARG1), (ARG2), (ARG3))
 
 #else
 
 typedef void (* NP_LOADDS NPP_StreamAsFileUPP)(NPP instance, NPStream* stream, const char* fname);
-#define NewNPP_StreamAsFileProc(FUNC)       \
+#define NewNPP_StreamAsFileProc(FUNC)		\
         ((NPP_StreamAsFileUPP) (FUNC))
-#define CallNPP_StreamAsFileProc(FUNC,  ARG1, ARG2, ARG3)       \
+#define CallNPP_StreamAsFileProc(FUNC,  ARG1, ARG2, ARG3)		\
         (*(FUNC))((ARG1), (ARG2), (ARG3))
 #endif
 
@@ -363,17 +363,17 @@ enum {
         | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPPrint *)))
         | RESULT_SIZE(SIZE_CODE(0))
 };
-#define NewNPP_PrintProc(FUNC)      \
+#define NewNPP_PrintProc(FUNC)		\
         (NPP_PrintUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_PrintProcInfo, GetCurrentArchitecture())
-#define CallNPP_PrintProc(FUNC,  NPParg, voidPtr)       \
+#define CallNPP_PrintProc(FUNC,  NPParg, voidPtr)		\
         (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_PrintProcInfo, (NPParg), (voidPtr))
 
 #else
 
 typedef void (* NP_LOADDS NPP_PrintUPP)(NPP instance, NPPrint* platformPrint);
-#define NewNPP_PrintProc(FUNC)      \
+#define NewNPP_PrintProc(FUNC)		\
         ((NPP_PrintUPP) (FUNC))
-#define CallNPP_PrintProc(FUNC,  NPParg, NPPrintArg)        \
+#define CallNPP_PrintProc(FUNC,  NPParg, NPPrintArg)		\
         (*(FUNC))((NPParg), (NPPrintArg))
 
 #endif
@@ -390,17 +390,17 @@ enum {
         | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(void *)))
         | RESULT_SIZE(SIZE_CODE(sizeof(int16)))
 };
-#define NewNPP_HandleEventProc(FUNC)        \
+#define NewNPP_HandleEventProc(FUNC)		\
         (NPP_HandleEventUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_HandleEventProcInfo, GetCurrentArchitecture())
-#define CallNPP_HandleEventProc(FUNC,  NPParg, voidPtr)     \
+#define CallNPP_HandleEventProc(FUNC,  NPParg, voidPtr)		\
         (int16)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_HandleEventProcInfo, (NPParg), (voidPtr))
 
 #else
 
 typedef int16 (* NP_LOADDS NPP_HandleEventUPP)(NPP instance, void* event);
-#define NewNPP_HandleEventProc(FUNC)        \
+#define NewNPP_HandleEventProc(FUNC)		\
         ((NPP_HandleEventUPP) (FUNC))
-#define CallNPP_HandleEventProc(FUNC,  NPParg, voidPtr)     \
+#define CallNPP_HandleEventProc(FUNC,  NPParg, voidPtr)		\
         (*(FUNC))((NPParg), (voidPtr))
 
 #endif
@@ -419,17 +419,17 @@ enum {
         | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(void*)))
         | RESULT_SIZE(SIZE_CODE(SIZE_CODE(0)))
 };
-#define NewNPP_URLNotifyProc(FUNC)      \
+#define NewNPP_URLNotifyProc(FUNC)		\
         (NPP_URLNotifyUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_URLNotifyProcInfo, GetCurrentArchitecture())
-#define CallNPP_URLNotifyProc(FUNC,  ARG1, ARG2, ARG3, ARG4)        \
+#define CallNPP_URLNotifyProc(FUNC,  ARG1, ARG2, ARG3, ARG4)		\
         (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_URLNotifyProcInfo, (ARG1), (ARG2), (ARG3), (ARG4))
 
 #else
 
 typedef void (* NP_LOADDS NPP_URLNotifyUPP)(NPP instance, const char* url, NPReason reason, void* notifyData);
-#define NewNPP_URLNotifyProc(FUNC)      \
+#define NewNPP_URLNotifyProc(FUNC)		\
         ((NPP_URLNotifyUPP) (FUNC))
-#define CallNPP_URLNotifyProc(FUNC,  ARG1, ARG2, ARG3, ARG4)        \
+#define CallNPP_URLNotifyProc(FUNC,  ARG1, ARG2, ARG3, ARG4)		\
         (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4))
 
 #endif
@@ -447,16 +447,16 @@ enum {
         | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(void *)))
         | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
 };
-#define NewNPP_GetValueProc(FUNC)       \
+#define NewNPP_GetValueProc(FUNC)		\
         (NPP_GetValueUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_GetValueProcInfo, GetCurrentArchitecture())
 #define CallNPP_GetValueProc(FUNC, ARG1, ARG2, ARG3) \
         (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_GetValueProcInfo, (ARG1), (ARG2), (ARG3))
 #else
 
-typedef NPError (* NP_LOADDS NPP_GetValueUPP)(NPP instance, NPPVariable variable, void *ret_alue);
-#define NewNPP_GetValueProc(FUNC)       \
+typedef NPError	(* NP_LOADDS NPP_GetValueUPP)(NPP instance, NPPVariable variable, void *ret_alue);
+#define NewNPP_GetValueProc(FUNC)		\
         ((NPP_GetValueUPP) (FUNC))
-#define CallNPP_GetValueProc(FUNC, ARG1, ARG2, ARG3)        \
+#define CallNPP_GetValueProc(FUNC, ARG1, ARG2, ARG3)		\
         (*(FUNC))((ARG1), (ARG2), (ARG3))
 #endif
 
@@ -473,16 +473,16 @@ enum {
         | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(void *)))
         | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
 };
-#define NewNPP_SetValueProc(FUNC)       \
+#define NewNPP_SetValueProc(FUNC)		\
         (NPP_SetValueUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_SetValueProcInfo, GetCurrentArchitecture())
 #define CallNPP_SetValueProc(FUNC, ARG1, ARG2, ARG3) \
         (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_SetValueProcInfo, (ARG1), (ARG2), (ARG3))
 #else
 
-typedef NPError (* NP_LOADDS NPP_SetValueUPP)(NPP instance, NPNVariable variable, void *ret_alue);
-#define NewNPP_SetValueProc(FUNC)       \
+typedef NPError	(* NP_LOADDS NPP_SetValueUPP)(NPP instance, NPNVariable variable, void *ret_alue);
+#define NewNPP_SetValueProc(FUNC)		\
         ((NPP_SetValueUPP) (FUNC))
-#define CallNPP_SetValueProc(FUNC, ARG1, ARG2, ARG3)        \
+#define CallNPP_SetValueProc(FUNC, ARG1, ARG2, ARG3)		\
         (*(FUNC))((ARG1), (ARG2), (ARG3))
 #endif
 
@@ -506,16 +506,16 @@ enum {
         | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(void *)))
         | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
 };
-#define NewNPN_GetValueProc(FUNC)       \
+#define NewNPN_GetValueProc(FUNC)		\
         (NPN_GetValueUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_GetValueProcInfo, GetCurrentArchitecture())
 #define CallNPN_GetValueProc(FUNC, ARG1, ARG2, ARG3) \
         (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetValueProcInfo, (ARG1), (ARG2), (ARG3))
 #else
 
-typedef NPError (* NP_LOADDS NPN_GetValueUPP)(NPP instance, NPNVariable variable, void *ret_alue);
-#define NewNPN_GetValueProc(FUNC)       \
+typedef NPError	(* NP_LOADDS NPN_GetValueUPP)(NPP instance, NPNVariable variable, void *ret_alue);
+#define NewNPN_GetValueProc(FUNC)		\
         ((NPN_GetValueUPP) (FUNC))
-#define CallNPN_GetValueProc(FUNC, ARG1, ARG2, ARG3)        \
+#define CallNPN_GetValueProc(FUNC, ARG1, ARG2, ARG3)		\
         (*(FUNC))((ARG1), (ARG2), (ARG3))
 #endif
 
@@ -532,16 +532,16 @@ enum {
         | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(void *)))
         | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
 };
-#define NewNPN_SetValueProc(FUNC)       \
+#define NewNPN_SetValueProc(FUNC)		\
         (NPN_SetValueUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_SetValueProcInfo, GetCurrentArchitecture())
 #define CallNPN_SetValueProc(FUNC, ARG1, ARG2, ARG3) \
         (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_SetValueProcInfo, (ARG1), (ARG2), (ARG3))
 #else
 
-typedef NPError (* NP_LOADDS NPN_SetValueUPP)(NPP instance, NPPVariable variable, void *ret_alue);
-#define NewNPN_SetValueProc(FUNC)       \
+typedef NPError	(* NP_LOADDS NPN_SetValueUPP)(NPP instance, NPPVariable variable, void *ret_alue);
+#define NewNPN_SetValueProc(FUNC)		\
         ((NPN_SetValueUPP) (FUNC))
-#define CallNPN_SetValueProc(FUNC, ARG1, ARG2, ARG3)        \
+#define CallNPN_SetValueProc(FUNC, ARG1, ARG2, ARG3)		\
         (*(FUNC))((ARG1), (ARG2), (ARG3))
 #endif
 
@@ -559,16 +559,16 @@ enum {
         | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(void*)))
         | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
 };
-#define NewNPN_GetURLNotifyProc(FUNC)       \
+#define NewNPN_GetURLNotifyProc(FUNC)		\
         (NPN_GetURLNotifyUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_GetURLNotifyProcInfo, GetCurrentArchitecture())
 #define CallNPN_GetURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4) \
         (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetURLNotifyProcInfo, (ARG1), (ARG2), (ARG3), (ARG4))
 #else
 
-typedef NPError (* NP_LOADDS NPN_GetURLNotifyUPP)(NPP instance, const char* url, const char* window, void* notifyData);
-#define NewNPN_GetURLNotifyProc(FUNC)       \
+typedef NPError	(* NP_LOADDS NPN_GetURLNotifyUPP)(NPP instance, const char* url, const char* window, void* notifyData);
+#define NewNPN_GetURLNotifyProc(FUNC)		\
         ((NPN_GetURLNotifyUPP) (FUNC))
-#define CallNPN_GetURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4)      \
+#define CallNPN_GetURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4)		\
         (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4))
 #endif
 
@@ -589,14 +589,14 @@ enum {
         | STACK_ROUTINE_PARAMETER(7, SIZE_CODE(sizeof(void*)))
         | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
 };
-#define NewNPN_PostURLNotifyProc(FUNC)      \
+#define NewNPN_PostURLNotifyProc(FUNC)		\
         (NPN_PostURLNotifyUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_PostURLNotifyProcInfo, GetCurrentArchitecture())
 #define CallNPN_PostURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7) \
         (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_PostURLNotifyProcInfo, (ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7))
 #else
 
 typedef NPError (* NP_LOADDS NPN_PostURLNotifyUPP)(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file, void* notifyData);
-#define NewNPN_PostURLNotifyProc(FUNC)      \
+#define NewNPN_PostURLNotifyProc(FUNC)		\
         ((NPN_PostURLNotifyUPP) (FUNC))
 #define CallNPN_PostURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7) \
         (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7))
@@ -615,16 +615,16 @@ enum {
         | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(const char*)))
         | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
 };
-#define NewNPN_GetURLProc(FUNC)     \
+#define NewNPN_GetURLProc(FUNC)		\
         (NPN_GetURLUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_GetURLProcInfo, GetCurrentArchitecture())
 #define CallNPN_GetURLProc(FUNC, ARG1, ARG2, ARG3) \
         (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetURLProcInfo, (ARG1), (ARG2), (ARG3))
 #else
 
-typedef NPError (* NP_LOADDS NPN_GetURLUPP)(NPP instance, const char* url, const char* window);
-#define NewNPN_GetURLProc(FUNC)     \
+typedef NPError	(* NP_LOADDS NPN_GetURLUPP)(NPP instance, const char* url, const char* window);
+#define NewNPN_GetURLProc(FUNC)		\
         ((NPN_GetURLUPP) (FUNC))
-#define CallNPN_GetURLProc(FUNC, ARG1, ARG2, ARG3)      \
+#define CallNPN_GetURLProc(FUNC, ARG1, ARG2, ARG3)		\
         (*(FUNC))((ARG1), (ARG2), (ARG3))
 #endif
 
@@ -644,14 +644,14 @@ enum {
         | STACK_ROUTINE_PARAMETER(6, SIZE_CODE(sizeof(NPBool)))
         | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
 };
-#define NewNPN_PostURLProc(FUNC)        \
+#define NewNPN_PostURLProc(FUNC)		\
         (NPN_PostURLUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_PostURLProcInfo, GetCurrentArchitecture())
 #define CallNPN_PostURLProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6) \
         (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_PostURLProcInfo, (ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6))
 #else
 
 typedef NPError (* NP_LOADDS NPN_PostURLUPP)(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file);
-#define NewNPN_PostURLProc(FUNC)        \
+#define NewNPN_PostURLProc(FUNC)		\
         ((NPN_PostURLUPP) (FUNC))
 #define CallNPN_PostURLProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6) \
         (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6))
@@ -669,17 +669,17 @@ enum {
         | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPByteRange *)))
         | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
 };
-#define NewNPN_RequestReadProc(FUNC)        \
+#define NewNPN_RequestReadProc(FUNC)		\
         (NPN_RequestReadUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_RequestReadProcInfo, GetCurrentArchitecture())
-#define CallNPN_RequestReadProc(FUNC,  stream, range)       \
+#define CallNPN_RequestReadProc(FUNC,  stream, range)		\
         (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_RequestReadProcInfo, (stream), (range))
 
 #else
 
-typedef NPError (* NP_LOADDS NPN_RequestReadUPP)(NPStream* stream, NPByteRange* rangeList);
-#define NewNPN_RequestReadProc(FUNC)        \
+typedef NPError	(* NP_LOADDS NPN_RequestReadUPP)(NPStream* stream, NPByteRange* rangeList);
+#define NewNPN_RequestReadProc(FUNC)		\
         ((NPN_RequestReadUPP) (FUNC))
-#define CallNPN_RequestReadProc(FUNC, stream, range)        \
+#define CallNPN_RequestReadProc(FUNC, stream, range)		\
         (*(FUNC))((stream), (range))
 
 #endif
@@ -698,17 +698,17 @@ enum {
         | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(NPStream **)))
         | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
 };
-#define NewNPN_NewStreamProc(FUNC)      \
+#define NewNPN_NewStreamProc(FUNC)		\
         (NPN_NewStreamUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_NewStreamProcInfo, GetCurrentArchitecture())
-#define CallNPN_NewStreamProc(FUNC, npp, type, window, stream)      \
-        (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_NewStreamProcInfo, (npp), (type), (window), (stream))
+#define CallNPN_NewStreamProc(FUNC, npp, type, window, stream)		\
+        (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_NewStreamProcInfo, (npp), (type), (window), (stream))	
 
 #else
 
-typedef NPError (* NP_LOADDS NPN_NewStreamUPP)(NPP instance, NPMIMEType type, const char* window, NPStream** stream);
-#define NewNPN_NewStreamProc(FUNC)      \
+typedef NPError	(* NP_LOADDS NPN_NewStreamUPP)(NPP instance, NPMIMEType type, const char* window, NPStream** stream);
+#define NewNPN_NewStreamProc(FUNC)		\
         ((NPN_NewStreamUPP) (FUNC))
-#define CallNPN_NewStreamProc(FUNC, npp, type, window, stream)      \
+#define CallNPN_NewStreamProc(FUNC, npp, type, window, stream)		\
         (*(FUNC))((npp), (type), (window), (stream))
 
 #endif
@@ -727,17 +727,17 @@ enum {
         | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(void*)))
         | RESULT_SIZE(SIZE_CODE(sizeof(int32)))
 };
-#define NewNPN_WriteProc(FUNC)      \
+#define NewNPN_WriteProc(FUNC)		\
         (NPN_WriteUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_WriteProcInfo, GetCurrentArchitecture())
-#define CallNPN_WriteProc(FUNC, npp, stream, len, buffer)       \
-        (int32)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_WriteProcInfo, (npp), (stream), (len), (buffer))
+#define CallNPN_WriteProc(FUNC, npp, stream, len, buffer)		\
+        (int32)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_WriteProcInfo, (npp), (stream), (len), (buffer))	
 
 #else
 
 typedef int32 (* NP_LOADDS NPN_WriteUPP)(NPP instance, NPStream* stream, int32 len, void* buffer);
-#define NewNPN_WriteProc(FUNC)      \
+#define NewNPN_WriteProc(FUNC)		\
         ((NPN_WriteUPP) (FUNC))
-#define CallNPN_WriteProc(FUNC, npp, stream, len, buffer)       \
+#define CallNPN_WriteProc(FUNC, npp, stream, len, buffer)		\
         (*(FUNC))((npp), (stream), (len), (buffer))
 
 #endif
@@ -755,17 +755,17 @@ enum {
         | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(NPReason)))
         | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
 };
-#define NewNPN_DestroyStreamProc(FUNC)      \
+#define NewNPN_DestroyStreamProc(FUNC)		\
         (NPN_DestroyStreamUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_DestroyStreamProcInfo, GetCurrentArchitecture())
-#define CallNPN_DestroyStreamProc(FUNC, npp, stream, reason)        \
-        (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_DestroyStreamProcInfo, (npp), (stream), (reason))
+#define CallNPN_DestroyStreamProc(FUNC, npp, stream, reason)		\
+        (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_DestroyStreamProcInfo, (npp), (stream), (reason))	
 
 #else
 
 typedef NPError (* NP_LOADDS NPN_DestroyStreamUPP)(NPP instance, NPStream* stream, NPReason reason);
-#define NewNPN_DestroyStreamProc(FUNC)      \
+#define NewNPN_DestroyStreamProc(FUNC)		\
         ((NPN_DestroyStreamUPP) (FUNC))
-#define CallNPN_DestroyStreamProc(FUNC, npp, stream, reason)        \
+#define CallNPN_DestroyStreamProc(FUNC, npp, stream, reason)		\
         (*(FUNC))((npp), (stream), (reason))
 
 #endif
@@ -782,18 +782,18 @@ enum {
         | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(char *)))
 };
 
-#define NewNPN_StatusProc(FUNC)     \
+#define NewNPN_StatusProc(FUNC)		\
         (NPN_StatusUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_StatusProcInfo, GetCurrentArchitecture())
-#define CallNPN_StatusProc(FUNC, npp, msg)      \
-        (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_StatusProcInfo, (npp), (msg))
+#define CallNPN_StatusProc(FUNC, npp, msg)		\
+        (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_StatusProcInfo, (npp), (msg))	
 
 #else
 
 typedef void (* NP_LOADDS NPN_StatusUPP)(NPP instance, const char* message);
-#define NewNPN_StatusProc(FUNC)     \
+#define NewNPN_StatusProc(FUNC)		\
         ((NPN_StatusUPP) (FUNC))
-#define CallNPN_StatusProc(FUNC, npp, msg)      \
-        (*(FUNC))((npp), (msg))
+#define CallNPN_StatusProc(FUNC, npp, msg)		\
+        (*(FUNC))((npp), (msg))	
 
 #endif
 
@@ -815,7 +815,7 @@ enum {
 
 #else
 
-typedef const char* (* NP_LOADDS NPN_UserAgentUPP)(NPP instance);
+typedef const char*	(* NP_LOADDS NPN_UserAgentUPP)(NPP instance);
 #define NewNPN_UserAgentProc(FUNC)              \
                 ((NPN_UserAgentUPP) (FUNC))
 #define CallNPN_UserAgentProc(FUNC, ARG1)               \
@@ -834,18 +834,18 @@ enum {
         | RESULT_SIZE(SIZE_CODE(sizeof(void *)))
 };
 
-#define NewNPN_MemAllocProc(FUNC)       \
+#define NewNPN_MemAllocProc(FUNC)		\
         (NPN_MemAllocUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_MemAllocProcInfo, GetCurrentArchitecture())
-#define CallNPN_MemAllocProc(FUNC, ARG1)        \
-        (void*)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_MemAllocProcInfo, (ARG1))
+#define CallNPN_MemAllocProc(FUNC, ARG1)		\
+        (void*)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_MemAllocProcInfo, (ARG1))	
 
 #else
 
 typedef void* (* NP_LOADDS NPN_MemAllocUPP)(uint32 size);
-#define NewNPN_MemAllocProc(FUNC)       \
+#define NewNPN_MemAllocProc(FUNC)		\
         ((NPN_MemAllocUPP) (FUNC))
-#define CallNPN_MemAllocProc(FUNC, ARG1)        \
-        (*(FUNC))((ARG1))
+#define CallNPN_MemAllocProc(FUNC, ARG1)		\
+        (*(FUNC))((ARG1))	
 
 #endif
 
@@ -860,18 +860,18 @@ enum {
         | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(void *)))
 };
 
-#define NewNPN_MemFreeProc(FUNC)        \
+#define NewNPN_MemFreeProc(FUNC)		\
         (NPN_MemFreeUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_MemFreeProcInfo, GetCurrentArchitecture())
-#define CallNPN_MemFreeProc(FUNC, ARG1)     \
+#define CallNPN_MemFreeProc(FUNC, ARG1)		\
         (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_MemFreeProcInfo, (ARG1))
 
 #else
 
 typedef void (* NP_LOADDS NPN_MemFreeUPP)(void* ptr);
-#define NewNPN_MemFreeProc(FUNC)        \
+#define NewNPN_MemFreeProc(FUNC)		\
         ((NPN_MemFreeUPP) (FUNC))
-#define CallNPN_MemFreeProc(FUNC, ARG1)     \
-        (*(FUNC))((ARG1))
+#define CallNPN_MemFreeProc(FUNC, ARG1)		\
+        (*(FUNC))((ARG1))	
 
 #endif
 
@@ -887,18 +887,18 @@ enum {
         | RESULT_SIZE(SIZE_CODE(sizeof(uint32)))
 };
 
-#define NewNPN_MemFlushProc(FUNC)       \
+#define NewNPN_MemFlushProc(FUNC)		\
         (NPN_MemFlushUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_MemFlushProcInfo, GetCurrentArchitecture())
-#define CallNPN_MemFlushProc(FUNC, ARG1)        \
-        (uint32)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_MemFlushProcInfo, (ARG1))
+#define CallNPN_MemFlushProc(FUNC, ARG1)		\
+        (uint32)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_MemFlushProcInfo, (ARG1))	
 
 #else
 
 typedef uint32 (* NP_LOADDS NPN_MemFlushUPP)(uint32 size);
-#define NewNPN_MemFlushProc(FUNC)       \
+#define NewNPN_MemFlushProc(FUNC)		\
         ((NPN_MemFlushUPP) (FUNC))
-#define CallNPN_MemFlushProc(FUNC, ARG1)        \
-        (*(FUNC))((ARG1))
+#define CallNPN_MemFlushProc(FUNC, ARG1)		\
+        (*(FUNC))((ARG1))	
 
 #endif
 
@@ -915,18 +915,18 @@ enum {
         | RESULT_SIZE(SIZE_CODE(0))
 };
 
-#define NewNPN_ReloadPluginsProc(FUNC)      \
+#define NewNPN_ReloadPluginsProc(FUNC)		\
         (NPN_ReloadPluginsUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_ReloadPluginsProcInfo, GetCurrentArchitecture())
-#define CallNPN_ReloadPluginsProc(FUNC, ARG1)       \
-        (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_ReloadPluginsProcInfo, (ARG1))
+#define CallNPN_ReloadPluginsProc(FUNC, ARG1)		\
+        (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_ReloadPluginsProcInfo, (ARG1))	
 
 #else
 
 typedef void (* NP_LOADDS NPN_ReloadPluginsUPP)(NPBool reloadPages);
-#define NewNPN_ReloadPluginsProc(FUNC)      \
+#define NewNPN_ReloadPluginsProc(FUNC)		\
         ((NPN_ReloadPluginsUPP) (FUNC))
-#define CallNPN_ReloadPluginsProc(FUNC, ARG1)       \
-        (*(FUNC))((ARG1))
+#define CallNPN_ReloadPluginsProc(FUNC, ARG1)		\
+        (*(FUNC))((ARG1))	
 
 #endif
 
@@ -941,17 +941,17 @@ enum {
         | RESULT_SIZE(SIZE_CODE(sizeof(JRIEnv*)))
 };
 
-#define NewNPN_GetJavaEnvProc(FUNC)     \
+#define NewNPN_GetJavaEnvProc(FUNC)		\
         (NPN_GetJavaEnvUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_GetJavaEnvProcInfo, GetCurrentArchitecture())
-#define CallNPN_GetJavaEnvProc(FUNC)        \
-        (JRIEnv*)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetJavaEnvProcInfo)
+#define CallNPN_GetJavaEnvProc(FUNC)		\
+        (JRIEnv*)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetJavaEnvProcInfo)	
 
 #else
 typedef JRIEnv* (* NP_LOADDS NPN_GetJavaEnvUPP)(void);
-#define NewNPN_GetJavaEnvProc(FUNC)     \
+#define NewNPN_GetJavaEnvProc(FUNC)		\
         ((NPN_GetJavaEnvUPP) (FUNC))
-#define CallNPN_GetJavaEnvProc(FUNC)        \
-        (*(FUNC))()
+#define CallNPN_GetJavaEnvProc(FUNC)		\
+        (*(FUNC))()	
 
 #endif
 
@@ -967,18 +967,18 @@ enum {
         | RESULT_SIZE(SIZE_CODE(sizeof(jref)))
 };
 
-#define NewNPN_GetJavaPeerProc(FUNC)        \
+#define NewNPN_GetJavaPeerProc(FUNC)		\
         (NPN_GetJavaPeerUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_GetJavaPeerProcInfo, GetCurrentArchitecture())
-#define CallNPN_GetJavaPeerProc(FUNC, ARG1)     \
-        (jref)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetJavaPeerProcInfo, (ARG1))
+#define CallNPN_GetJavaPeerProc(FUNC, ARG1)		\
+        (jref)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetJavaPeerProcInfo, (ARG1))	
 
 #else
 
 typedef jref (* NP_LOADDS NPN_GetJavaPeerUPP)(NPP instance);
-#define NewNPN_GetJavaPeerProc(FUNC)        \
+#define NewNPN_GetJavaPeerProc(FUNC)		\
         ((NPN_GetJavaPeerUPP) (FUNC))
-#define CallNPN_GetJavaPeerProc(FUNC, ARG1)     \
-        (*(FUNC))((ARG1))
+#define CallNPN_GetJavaPeerProc(FUNC, ARG1)		\
+        (*(FUNC))((ARG1))	
 
 #endif
 
@@ -995,18 +995,18 @@ enum {
         | RESULT_SIZE(SIZE_CODE(0))
 };
 
-#define NewNPN_InvalidateRectProc(FUNC)     \
+#define NewNPN_InvalidateRectProc(FUNC)		\
         (NPN_InvalidateRectUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_InvalidateRectProcInfo, GetCurrentArchitecture())
-#define CallNPN_InvalidateRectProc(FUNC, ARG1, ARG2)        \
-        (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_InvalidateRectProcInfo, (ARG1), (ARG2))
+#define CallNPN_InvalidateRectProc(FUNC, ARG1, ARG2)		\
+        (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_InvalidateRectProcInfo, (ARG1), (ARG2))	
 
 #else
 
 typedef void (* NP_LOADDS NPN_InvalidateRectUPP)(NPP instance, NPRect *rect);
-#define NewNPN_InvalidateRectProc(FUNC)     \
+#define NewNPN_InvalidateRectProc(FUNC)		\
         ((NPN_InvalidateRectUPP) (FUNC))
-#define CallNPN_InvalidateRectProc(FUNC, ARG1, ARG2)        \
-        (*(FUNC))((ARG1), (ARG2))
+#define CallNPN_InvalidateRectProc(FUNC, ARG1, ARG2)		\
+        (*(FUNC))((ARG1), (ARG2))	
 
 #endif
 
@@ -1023,18 +1023,18 @@ enum {
         | RESULT_SIZE(SIZE_CODE(0))
 };
 
-#define NewNPN_InvalidateRegionProc(FUNC)       \
+#define NewNPN_InvalidateRegionProc(FUNC)		\
         (NPN_InvalidateRegionUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_InvalidateRegionProcInfo, GetCurrentArchitecture())
-#define CallNPN_InvalidateRegionProc(FUNC, ARG1, ARG2)      \
-        (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_InvalidateRegionProcInfo, (ARG1), (ARG2))
+#define CallNPN_InvalidateRegionProc(FUNC, ARG1, ARG2)		\
+        (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_InvalidateRegionProcInfo, (ARG1), (ARG2))	
 
 #else
 
 typedef void (* NP_LOADDS NPN_InvalidateRegionUPP)(NPP instance, NPRegion region);
-#define NewNPN_InvalidateRegionProc(FUNC)       \
+#define NewNPN_InvalidateRegionProc(FUNC)		\
         ((NPN_InvalidateRegionUPP) (FUNC))
-#define CallNPN_InvalidateRegionProc(FUNC, ARG1, ARG2)      \
-        (*(FUNC))((ARG1), (ARG2))
+#define CallNPN_InvalidateRegionProc(FUNC, ARG1, ARG2)		\
+        (*(FUNC))((ARG1), (ARG2))	
 
 #endif
 
@@ -1049,18 +1049,18 @@ enum {
         | RESULT_SIZE(SIZE_CODE(sizeof(0)))
 };
 
-#define NewNPN_ForceRedrawProc(FUNC)        \
+#define NewNPN_ForceRedrawProc(FUNC)		\
         (NPN_ForceRedrawUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_ForceRedrawProcInfo, GetCurrentArchitecture())
-#define CallNPN_ForceRedrawProc(FUNC, ARG1)     \
-        (jref)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_ForceRedrawProcInfo, (ARG1))
+#define CallNPN_ForceRedrawProc(FUNC, ARG1)		\
+        (jref)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_ForceRedrawProcInfo, (ARG1))	
 
 #else
 
 typedef void (* NP_LOADDS NPN_ForceRedrawUPP)(NPP instance);
-#define NewNPN_ForceRedrawProc(FUNC)        \
+#define NewNPN_ForceRedrawProc(FUNC)		\
         ((NPN_ForceRedrawUPP) (FUNC))
-#define CallNPN_ForceRedrawProc(FUNC, ARG1)     \
-        (*(FUNC))((ARG1))
+#define CallNPN_ForceRedrawProc(FUNC, ARG1)		\
+        (*(FUNC))((ARG1))	
 
 #endif
 
@@ -1149,17 +1149,17 @@ enum {
         | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(NPP_ShutdownUPP*)))
         | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
 };
-#define NewNPP_MainEntryProc(FUNC)      \
+#define NewNPP_MainEntryProc(FUNC)		\
         (NPP_MainEntryUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_MainEntryProcInfo, GetCurrentArchitecture())
-#define CallNPP_MainEntryProc(FUNC,  netscapeFunc, pluginFunc, shutdownUPP)     \
+#define CallNPP_MainEntryProc(FUNC,  netscapeFunc, pluginFunc, shutdownUPP)		\
         CallUniversalProc((UniversalProcPtr)(FUNC), (ProcInfoType)uppNPP_MainEntryProcInfo, (netscapeFunc), (pluginFunc), (shutdownUPP))
 
 #else
 
 typedef NPError (* NP_LOADDS NPP_MainEntryUPP)(NPNetscapeFuncs*, NPPluginFuncs*, NPP_ShutdownUPP*);
-#define NewNPP_MainEntryProc(FUNC)      \
+#define NewNPP_MainEntryProc(FUNC)		\
         ((NPP_MainEntryUPP) (FUNC))
-#define CallNPP_MainEntryProc(FUNC,  netscapeFunc, pluginFunc, shutdownUPP)     \
+#define CallNPP_MainEntryProc(FUNC,  netscapeFunc, pluginFunc, shutdownUPP)		\
         (*(FUNC))((netscapeFunc), (pluginFunc), (shutdownUPP))
 
 #endif
@@ -1170,7 +1170,7 @@ typedef NPError (* NP_LOADDS NPP_MainEntryUPP)(NPNetscapeFuncs*, NPPluginFuncs*,
  * These can be called to retreive MIME information from the plugin dynamically
  *
  * Note: For compatibility with Quicktime, BPSupportedMIMEtypes is another way
- *       to get mime info from the plugin only on OSX and may not be supported
+ *       to get mime info from the plugin only on OSX and may not be supported 
  *       in furture version--use NP_GetMIMEDescription instead
  */
 
@@ -1195,9 +1195,9 @@ enum {
     uppNP_GetMIMEDescEntryProc = kThinkCStackBased
         | RESULT_SIZE(SIZE_CODE(sizeof(const char *)))
 };
-#define NewNP_GetMIMEDescEntryProc(FUNC)        \
+#define NewNP_GetMIMEDescEntryProc(FUNC)		\
         (NP_GetMIMEDescriptionUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNP_GetMIMEDescEntryProc, GetCurrentArchitecture())
-#define CallNP_GetMIMEDescEntryProc(FUNC)       \
+#define CallNP_GetMIMEDescEntryProc(FUNC)		\
         (const char *)CallUniversalProc((UniversalProcPtr)(FUNC), (ProcInfoType)uppNP_GetMIMEDescEntryProc)
 
 
@@ -1206,15 +1206,15 @@ enum {
  // NP_GetMIMEDescription
 #define NP_GETMIMEDESCRIPTION_NAME "NP_GetMIMEDescription"
 typedef const char* (* NP_LOADDS NP_GetMIMEDescriptionUPP)();
-#define NewNP_GetMIMEDescEntryProc(FUNC)        \
+#define NewNP_GetMIMEDescEntryProc(FUNC)		\
         ((NP_GetMIMEDescriptionUPP) (FUNC))
-#define CallNP_GetMIMEDescEntryProc(FUNC)       \
+#define CallNP_GetMIMEDescEntryProc(FUNC)		\
         (*(FUNC))()
 // BP_GetSupportedMIMETypes
 typedef OSErr (* NP_LOADDS BP_GetSupportedMIMETypesUPP)(BPSupportedMIMETypes*, UInt32);
-#define NewBP_GetSupportedMIMETypesEntryProc(FUNC)      \
+#define NewBP_GetSupportedMIMETypesEntryProc(FUNC)		\
         ((BP_GetSupportedMIMETypesUPP) (FUNC))
-#define CallBP_GetMIMEDescEntryProc(FUNC,  mimeInfo, flags)     \
+#define CallBP_GetMIMEDescEntryProc(FUNC,  mimeInfo, flags)		\
         (*(FUNC))((mimeInfo), (flags))
 
 #endif
@@ -1259,7 +1259,7 @@ NPError OSCALL NP_Initialize(NPNetscapeFuncs* pFuncs);
 
 NPError OSCALL NP_Shutdown();
 
-char*   NP_GetMIMEDescription();
+char*	NP_GetMIMEDescription();
 
 #ifdef __cplusplus
 }
@@ -1279,9 +1279,9 @@ extern "C" {
 
 /* plugin meta member functions */
 
-char*   NP_GetMIMEDescription(void);
-NPError NP_Initialize(NPNetscapeFuncs*, NPPluginFuncs*);
-NPError NP_Shutdown(void);
+char*	NP_GetMIMEDescription(void);
+NPError	NP_Initialize(NPNetscapeFuncs*, NPPluginFuncs*);
+NPError	NP_Shutdown(void);
 
 #ifdef __cplusplus
 }