Author: toshok
Date: 2007-10-03 15:31:22 -0400 (Wed, 03 Oct 2007)
New Revision: 86827
Modified:
trunk/moon/plugin/ChangeLog
trunk/moon/plugin/moonlight.h
Log:
2007-10-03 Chris Toshok <[EMAIL PROTECTED]>
* moonlight.h: need to wrap the renamed symbols in an extern "C"
block.
Modified: trunk/moon/plugin/ChangeLog
===================================================================
--- trunk/moon/plugin/ChangeLog 2007-10-03 18:56:43 UTC (rev 86826)
+++ trunk/moon/plugin/ChangeLog 2007-10-03 19:31:22 UTC (rev 86827)
@@ -1,5 +1,10 @@
2007-10-03 Chris Toshok <[EMAIL PROTECTED]>
+ * moonlight.h: need to wrap the renamed symbols in an extern "C"
+ block.
+
+2007-10-03 Chris Toshok <[EMAIL PROTECTED]>
+
* moonlight.h, plugin-entry.cpp, plugin-proxy.cpp: if we're using
libmoonloader.so, we need to rename the 4 symbols we proxy in
plugin-entry.cpp, and load them up via our mangled names in
Modified: trunk/moon/plugin/moonlight.h
===================================================================
--- trunk/moon/plugin/moonlight.h 2007-10-03 18:56:43 UTC (rev 86826)
+++ trunk/moon/plugin/moonlight.h 2007-10-03 19:31:22 UTC (rev 86827)
@@ -53,7 +53,18 @@
// define his to 1 if we're building the xpi, leave it 0 if we're not
#define PLUGIN_INSTALL 0
+
+extern "C" {
+ char* LOADER_RENAMED_SYM(NP_GetMIMEDescription) (void);
+ NPError LOADER_RENAMED_SYM(NP_GetValue) (void *future, NPPVariable variable,
void *value);
+#ifdef XP_UNIX
+ NPError OSCALL LOADER_RENAMED_SYM(NP_Initialize) (NPNetscapeFuncs
*mozilla_funcs, NPPluginFuncs *plugin_funcs);
#else
+ NPError OSCALL LOADER_RENAMED_SYM(NP_Initialize) (NPNetscapeFuncs
*mozilla_funcs);
+#endif
+ NPError OSCALL LOADER_RENAMED_SYM(NP_Shutdown) (void);
+}
+#else
#define LOADER_RENAMED_SYM(x) x
#define LOADER_RENAMED_NAME(x) #x
#endif
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches