[Gnash-commit] gnash ChangeLog plugin/mozilla-sdk/Makefile.am ...

[Dossy Shiobara]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Dossy Shiobara <dossy>  08/03/31 00:35:34

Modified files:
        .              : ChangeLog 
        plugin/mozilla-sdk: Makefile.am np_entry.cpp 
        plugin/mozilla-sdk/include: npupp.h 

Log message:
        Reverting my own change to np_entry.cpp and Rob Savoye's change
        to npupp.h.  The correct fix is to Makefile.am and define
        _WINDOWS on Win32.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6104&r2=1.6105
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/mozilla-sdk/Makefile.am?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/mozilla-sdk/np_entry.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/mozilla-sdk/include/npupp.h?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6104
retrieving revision 1.6105
diff -u -b -r1.6104 -r1.6105
--- ChangeLog   30 Mar 2008 23:02:56 -0000      1.6104
+++ ChangeLog   31 Mar 2008 00:35:32 -0000      1.6105
@@ -1,3 +1,12 @@
+2008-03-30  Dossy Shiobara <address@hidden>
+
+       * plugin/mozilla-sdk/Makefile.am,
+         plugin/mozilla-sdk/np_entry.cpp,
+         plugin/mozilla-sdk/include/npupp.h: Reverting my own
+         change to np_entry.cpp and Rob Savoye's change to
+         npupp.h.  The correct fix is to Makefile.am and define
+         _WINDOWS on Win32.
+
 2008-03-31  Markus Gothe  <address@hidden>
 
        * libamf/amf.cpp: reinterpret return value.

Index: plugin/mozilla-sdk/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/mozilla-sdk/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- plugin/mozilla-sdk/Makefile.am      30 Mar 2008 18:25:34 -0000      1.19
+++ plugin/mozilla-sdk/Makefile.am      31 Mar 2008 00:35:33 -0000      1.20
@@ -21,7 +21,7 @@
 AM_CPPFLAGS = -DPLUGIN_TRACE
 
 if WIN32
-AM_CPPFLAGS += -DXP_WIN
+AM_CPPFLAGS += -DXP_WIN -D_WINDOWS
 else
 AM_CPPFLAGS += -DXP_UNIX
 endif

Index: plugin/mozilla-sdk/np_entry.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/mozilla-sdk/np_entry.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- plugin/mozilla-sdk/np_entry.cpp     30 Mar 2008 18:26:26 -0000      1.12
+++ plugin/mozilla-sdk/np_entry.cpp     31 Mar 2008 00:35:33 -0000      1.13
@@ -24,16 +24,6 @@
 #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()

Index: plugin/mozilla-sdk/include/npupp.h
===================================================================
RCS file: /sources/gnash/gnash/plugin/mozilla-sdk/include/npupp.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- plugin/mozilla-sdk/include/npupp.h  30 Mar 2008 20:56:15 -0000      1.9
+++ plugin/mozilla-sdk/include/npupp.h  31 Mar 2008 00:35:34 -0000      1.10
@@ -676,7 +676,7 @@
 /* plugin meta member functions */
 
 NP_EXPORT(char*)   NP_GetMIMEDescription(void);
-NP_EXPORT(NPError) NP_Initialize(NPNetscapeFuncs*);
+NP_EXPORT(NPError) NP_Initialize(NPNetscapeFuncs*, NPPluginFuncs*);
 NP_EXPORT(NPError) NP_Shutdown(void);
 NP_EXPORT(NPError) NP_GetValue(void *future, NPPVariable aVariable, void 
*aValue);