Commit 2b70aa34 authored by hausmann@webkit.org's avatar hausmann@webkit.org

Build fix for Qt/Gtk. Don't declare NP_InitializeFuncPtr twice

with different signatures.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@32804 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 4c512a84
2008-05-02 Simon Hausmann <hausmann@webkit.org>
Build fix for Qt/Gtk. Don't declare NP_InitializeFuncPtr twice
with different signatures.
* plugins/npfunctions.h:
2008-05-01 Robin Dunn <robin@alldunn.com>
Reviewed by Kevin Ollivier.
......@@ -180,7 +180,6 @@ typedef struct _NPPluginFuncs {
NPP_SetValueProcPtr setvalue;
} NPPluginFuncs;
typedef EXPORTED_CALLBACK(NPError, NP_InitializeFuncPtr)(NPNetscapeFuncs*);
typedef EXPORTED_CALLBACK(NPError, NP_GetEntryPointsFuncPtr)(NPPluginFuncs*);
typedef EXPORTED_CALLBACK(void, NPP_ShutdownProcPtr)(void);
......@@ -192,6 +191,8 @@ typedef NPError (*MainFuncPtr)(NPNetscapeFuncs*, NPPluginFuncs*, NPP_ShutdownPro
#if defined(XP_UNIX)
typedef EXPORTED_CALLBACK(NPError, NP_InitializeFuncPtr)(NPNetscapeFuncs*, NPPluginFuncs*);
typedef EXPORTED_CALLBACK(char*, NP_GetMIMEDescriptionFuncPtr)(void);
#else
typedef EXPORTED_CALLBACK(NPError, NP_InitializeFuncPtr)(NPNetscapeFuncs*);
#endif
#ifdef __cplusplus
......
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