Bug 605116 - Properly declare functions without arguments in npfunctions.h r=joshmoz a=benjamin

This commit is contained in:
Jacek Caban 2010-10-20 17:30:36 +00:00
parent 5a0c2f772a
commit f719b4c3e5

View File

@ -48,8 +48,8 @@
#include "npapi.h"
#include "npruntime.h"
typedef void (* NP_LOADDS NPP_InitializeProcPtr)();
typedef void (* NP_LOADDS NPP_ShutdownProcPtr)();
typedef void (* NP_LOADDS NPP_InitializeProcPtr)(void);
typedef void (* NP_LOADDS NPP_ShutdownProcPtr)(void);
typedef NPError (* NP_LOADDS NPP_NewProcPtr)(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved);
typedef NPError (* NP_LOADDS NPP_DestroyProcPtr)(NPP instance, NPSavedData** save);
typedef NPError (* NP_LOADDS NPP_SetWindowProcPtr)(NPP instance, NPWindow* window);
@ -86,7 +86,7 @@ typedef void* (*NPN_MemAllocProcPtr)(uint32_t size);
typedef void (*NPN_MemFreeProcPtr)(void* ptr);
typedef uint32_t (*NPN_MemFlushProcPtr)(uint32_t size);
typedef void (*NPN_ReloadPluginsProcPtr)(NPBool reloadPages);
typedef void* (*NPN_GetJavaEnvProcPtr)();
typedef void* (*NPN_GetJavaEnvProcPtr)(void);
typedef void* (*NPN_GetJavaPeerProcPtr)(NPP instance);
typedef void (*NPN_InvalidateRectProcPtr)(NPP instance, NPRect *rect);
typedef void (*NPN_InvalidateRegionProcPtr)(NPP instance, NPRegion region);
@ -226,7 +226,7 @@ typedef struct _BPSupportedMIMETypes
} BPSupportedMIMETypes;
OSErr BP_GetSupportedMIMETypes(BPSupportedMIMETypes *mimeInfo, UInt32 flags);
#define NP_GETMIMEDESCRIPTION_NAME "NP_GetMIMEDescription"
typedef const char* (*NP_GetMIMEDescriptionProcPtr)();
typedef const char* (*NP_GetMIMEDescriptionProcPtr)(void);
typedef OSErr (*BP_GetSupportedMIMETypesProcPtr)(BPSupportedMIMETypes*, UInt32);
#endif
@ -274,10 +274,10 @@ typedef NPError (*NP_GetEntryPointsFunc)(NPPluginFuncs*);
NPError OSCALL NP_GetEntryPoints(NPPluginFuncs* pFuncs);
typedef NPError (*NP_InitializeFunc)(NPNetscapeFuncs*);
NPError OSCALL NP_Initialize(NPNetscapeFuncs* bFuncs);
typedef NPError (*NP_ShutdownFunc)();
NPError OSCALL NP_Shutdown();
typedef char* (*NP_GetMIMEDescriptionFunc)();
char* NP_GetMIMEDescription();
typedef NPError (*NP_ShutdownFunc)(void);
NPError OSCALL NP_Shutdown(void);
typedef char* (*NP_GetMIMEDescriptionFunc)(void);
char* NP_GetMIMEDescription(void);
#ifdef __cplusplus
}
#endif
@ -291,10 +291,10 @@ char* NP_GetMIMEDescription();
#ifdef __cplusplus
extern "C" {
#endif
typedef char* (*NP_GetPluginVersionFunc)();
NP_EXPORT(char*) NP_GetPluginVersion();
typedef char* (*NP_GetMIMEDescriptionFunc)();
NP_EXPORT(char*) NP_GetMIMEDescription();
typedef char* (*NP_GetPluginVersionFunc)(void);
NP_EXPORT(char*) NP_GetPluginVersion(void);
typedef char* (*NP_GetMIMEDescriptionFunc)(void);
NP_EXPORT(char*) NP_GetMIMEDescription(void);
#ifdef XP_MACOSX
typedef NPError (*NP_InitializeFunc)(NPNetscapeFuncs*);
NP_EXPORT(NPError) NP_Initialize(NPNetscapeFuncs* bFuncs);
@ -304,8 +304,8 @@ NP_EXPORT(NPError) NP_GetEntryPoints(NPPluginFuncs* pFuncs);
typedef NPError (*NP_InitializeFunc)(NPNetscapeFuncs*, NPPluginFuncs*);
NP_EXPORT(NPError) NP_Initialize(NPNetscapeFuncs* bFuncs, NPPluginFuncs* pFuncs);
#endif
typedef NPError (*NP_ShutdownFunc)();
NP_EXPORT(NPError) NP_Shutdown();
typedef NPError (*NP_ShutdownFunc)(void);
NP_EXPORT(NPError) NP_Shutdown(void);
typedef NPError (*NP_GetValueFunc)(void *, NPPVariable, void *);
NP_EXPORT(NPError) NP_GetValue(void *future, NPPVariable aVariable, void *aValue);
#ifdef __cplusplus