[Libreoffice-commits] .: Branch 'libreoffice-3-6' - np_sdk/mozsrc

Michael Stahl mst at kemper.freedesktop.org
Tue Jun 5 14:00:25 PDT 2012


 np_sdk/mozsrc/npunix.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 2787968e044c0c83e7affb0a4c3375178dfa783c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jun 5 22:55:02 2012 +0200

    np_sdk: it looks like the NP_* functions need exporting
    
    At least, that's what the documentation says, and they used to be
    exported before gbuildization of extensions/np_sdk.
    
    Change-Id: Id0bcfab65c30de96bc2c0c708885ae9ed51c3519
    (cherry picked from commit 50cc97689e1ceb7754505d7c5b99510e48dbe674)

diff --git a/np_sdk/mozsrc/npunix.c b/np_sdk/mozsrc/npunix.c
index b99a545..0b5ff38 100644
--- a/np_sdk/mozsrc/npunix.c
+++ b/np_sdk/mozsrc/npunix.c
@@ -51,6 +51,8 @@
  *----------------------------------------------------------------------
  */
 
+#include <sal/types.h> // just for SAL_DLLPUBLIC_EXPORT
+
 #define XP_UNIX 1
 
 #include <stdio.h>
@@ -365,7 +367,7 @@ Private_GetJavaClass(void)
  *  - Netscape uses the return value to identify when an object instance
  *    of this plugin should be created.
  */
-char *
+SAL_DLLPUBLIC_EXPORT char *
 NP_GetMIMEDescription(void)
 {
     return (char *)NPP_GetMIMEDescription();
@@ -377,7 +379,7 @@ NP_GetMIMEDescription(void)
  *  - Interfaces with plugin to get values for predefined variables
  *    that the navigator needs.
  */
-NPError
+SAL_DLLPUBLIC_EXPORT NPError
 NP_GetValue(void* future, NPPVariable variable, void *value)
 {
     return NPP_GetValue(future, variable, value);
@@ -400,7 +402,7 @@ NP_GetValue(void* future, NPPVariable variable, void *value)
  *        library will use this function table to call the plugin.
  *
  */
-NPError
+SAL_DLLPUBLIC_EXPORT NPError
 NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
 {
     NPError err = NPERR_NO_ERROR;
@@ -496,7 +498,7 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
  *    the last object of this kind has been destroyed.
  *
  */
-void
+SAL_DLLPUBLIC_EXPORT void
 NP_Shutdown(void)
 {
     PLUGINDEBUGSTR("NP_Shutdown");


More information about the Libreoffice-commits mailing list