[Gnash-commit] gnash ChangeLog plugin/mozilla-sdk/np_entry.cpp

[Dossy Shiobara]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Dossy Shiobara <dossy>  08/03/30 18:26:26

Modified files:
        .              : ChangeLog 
        plugin/mozilla-sdk: np_entry.cpp 

Log message:
        Fix symbols so they're exported correctly on Win32.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6098&r2=1.6099
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/mozilla-sdk/np_entry.cpp?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6098
retrieving revision 1.6099
diff -u -b -r1.6098 -r1.6099
--- ChangeLog   30 Mar 2008 18:25:27 -0000      1.6098
+++ ChangeLog   30 Mar 2008 18:26:25 -0000      1.6099
@@ -1,5 +1,16 @@
 2008-03-30  Dossy Shiobara <address@hidden>
 
+       * plugin/mozilla-sdk/np_entry.cpp: Fix symbols so they're
+         exported correctly on Win32.
+
+2008-03-30  Dossy Shiobara <address@hidden>
+
+       * plugin/mozilla-sdk/Makefile.am: Build libmozsdk separately,
+         as its used by both the Win32 npgnash.dll and the
+         libgnashplugin.so on *nix.
+
+2008-03-30  Dossy Shiobara <address@hidden>
+
        * plugin/Makefile.am: Conditionally add directories to the
          SUBDIRS list.  Build plugin/mozilla-sdk separately, with its
          own Makefile.

Index: plugin/mozilla-sdk/np_entry.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/mozilla-sdk/np_entry.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- plugin/mozilla-sdk/np_entry.cpp     17 Mar 2008 15:22:17 -0000      1.11
+++ plugin/mozilla-sdk/np_entry.cpp     30 Mar 2008 18:26:26 -0000      1.12
@@ -24,6 +24,16 @@
 #include "npplat.h"
 #include "pluginbase.h"
 
+#ifdef __cplusplus
+extern "C" {
+  DSOEXPORT NPError OSCALL NP_Shutdown();
+  DSOEXPORT NPError OSCALL NP_Initialize(NPNetscapeFuncs* aNPNFuncs);
+#ifdef XP_WIN
+  DSOEXPORT NPError OSCALL NP_GetEntryPoints(NPPluginFuncs* aNPPFuncs);
+#endif
+}
+#endif /* __cplusplus */
+
 DSOEXPORT NPNetscapeFuncs NPNFuncs;
 
 DSOEXPORT NPError OSCALL NP_Shutdown()