From 71d65bb60c0863d13bc78ed35560e2e8bf59ad4d Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Mon, 22 Jun 2009 23:07:42 +0000
Subject: [PATCH] build on mac

---
 direct/src/plugin_npapi/nppanda3d_startup.cxx | 12 +++++++++++-
 direct/src/plugin_npapi/nppanda3d_startup.h   |  6 ++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/direct/src/plugin_npapi/nppanda3d_startup.cxx b/direct/src/plugin_npapi/nppanda3d_startup.cxx
index a94ea2e75b..bcdd5c5acf 100644
--- a/direct/src/plugin_npapi/nppanda3d_startup.cxx
+++ b/direct/src/plugin_npapi/nppanda3d_startup.cxx
@@ -147,8 +147,18 @@ NPP_SetValue(NPP instance, NPNVariable variable, void *value) {
 }
 
 // Symbol called once by the browser to initialize the plugin
+#ifdef _WIN32
+NPError OSCALL 
+NP_Initialize(NPNetscapeFuncs *browserFuncs)
+#else
+// On Mac, the API specifies this second parameter is included, but it
+// lies.  We actually don't get a second parameter on Mac, but we have
+// to put it here to make the compiler happy.
 NPError OSCALL
-NP_Initialize(NPNetscapeFuncs *browserFuncs) {
+NP_Initialize(NPNetscapeFuncs *browserFuncs,
+              NPPluginFuncs *pluginFuncs)
+#endif
+{
   // save away browser functions
   browser = browserFuncs;
 
diff --git a/direct/src/plugin_npapi/nppanda3d_startup.h b/direct/src/plugin_npapi/nppanda3d_startup.h
index 17241083a2..e93533939d 100644
--- a/direct/src/plugin_npapi/nppanda3d_startup.h
+++ b/direct/src/plugin_npapi/nppanda3d_startup.h
@@ -20,7 +20,13 @@
 #include "../plugin/load_plugin_src.h"
 
 extern "C" {
+#ifdef _WIN32
   NPError OSCALL NP_Initialize(NPNetscapeFuncs *browserFuncs);
+#else
+  NPError OSCALL NP_Initialize(NPNetscapeFuncs *browserFuncs,
+                               NPPluginFuncs *pluginFuncs);
+#endif
+
   NPError OSCALL NP_GetEntryPoints(NPPluginFuncs *pluginFuncs);
   NPError OSCALL NP_Shutdown(void);
 }