From eff62d413895d02b92da1a8396cb2bea1ce93902 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Mon, 26 Dec 2011 10:46:37 +0100
Subject: export libsunjavaplugin's API functions

---
 jvmfwk/Library_sunjavaplugin.mk        |  4 ++++
 jvmfwk/Package_inc.mk                  |  1 +
 jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h | 44 ++++++++++++++++++++++++++++++++++
 jvmfwk/inc/jvmfwk/vendorplugin.h       |  9 +++----
 4 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h

(limited to 'jvmfwk')

diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk
index 6e1a2f6dfef5..9ce54619d81d 100644
--- a/jvmfwk/Library_sunjavaplugin.mk
+++ b/jvmfwk/Library_sunjavaplugin.mk
@@ -27,6 +27,10 @@
 
 $(eval $(call gb_Library_Library,sunjavaplugin))
 
+$(eval $(call gb_Library_add_defs,sunjavaplugin,\
+    -DJVMFWK_PLUGIN_DLLIMPLEMENTATION \
+))
+
 ifneq ($(JVM_ONE_PATH_CHECK),)
 $(eval $(call gb_Library_add_defs,sunjavaplugin,\
     -DJVM_ONE_PATH_CHECK=\"$(JVM_ONE_PATH_CHECK)\" \
diff --git a/jvmfwk/Package_inc.mk b/jvmfwk/Package_inc.mk
index f8ae7ea8c521..fd8a616bdf8e 100644
--- a/jvmfwk/Package_inc.mk
+++ b/jvmfwk/Package_inc.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Package_Package,jvmfwk_inc,$(SRCDIR)/jvmfwk/inc/jvmfwk))
 
 $(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/framework.h,framework.h))
 $(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/jvmfwkdllapi.h,jvmfwkdllapi.h))
+$(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/jvmfwkplugindllapi.h,jvmfwkplugindllapi.h))
 $(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/vendorplugin.h,vendorplugin.h))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h b/jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h
new file mode 100644
index 000000000000..c7a29903be52
--- /dev/null
+++ b/jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+ *  (initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef INCLUDED_JVMFWK_JVMFWKPLUGINDLLAPI_H
+#define INCLUDED_JVMFWK_JVMFWKPLUGINDLLAPI_H
+
+#include <sal/types.h>
+
+#if defined JVMFWK_PLUGIN_DLLIMPLEMENTATION
+#   define JVMFWK_PLUGIN_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#   define JVMFWK_PLUGIN_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define JVMFWK_PLUGIN_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/inc/jvmfwk/vendorplugin.h b/jvmfwk/inc/jvmfwk/vendorplugin.h
index 3ccbb0e487f4..302037cecbfc 100644
--- a/jvmfwk/inc/jvmfwk/vendorplugin.h
+++ b/jvmfwk/inc/jvmfwk/vendorplugin.h
@@ -30,6 +30,7 @@
 #if !defined INCLUDED_JVMFWK_VENDORPLUGIN_H
 #define INCLUDED_JVMFWK_VENDORPLUGIN_H
 
+#include "jvmfwkplugindllapi.h"
 #include "jvmfwk/framework.h"
 #include "rtl/ustring.h"
 #ifdef SOLAR_JAVA
@@ -126,7 +127,7 @@ typedef enum
     <code>sMinVersion,sMaxVersion,arExcludeList</code> are not recognized as valid
     version strings.
  */
-javaPluginError jfw_plugin_getAllJavaInfos(
+JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_getAllJavaInfos(
     rtl_uString *sVendor,
     rtl_uString *sMinVersion,
     rtl_uString *sMaxVersion,
@@ -177,7 +178,7 @@ javaPluginError jfw_plugin_getAllJavaInfos(
    does not mean necessarily that there is no JRE. There could be a JRE but it has
    a vendor which is not supported by this API implementation.
  */
-javaPluginError jfw_plugin_getJavaInfoByPath(
+JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_getJavaInfoByPath(
     rtl_uString *sLocation,
     rtl_uString *sVendor,
     rtl_uString *sMinVersion,
@@ -230,7 +231,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
     JFW_PLUGIN_E_VM_CREATION_FAILED a VM could not be created. The error was caused
     by the JRE.
  */
-javaPluginError jfw_plugin_startJavaVirtualMachine(
+JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_startJavaVirtualMachine(
     const JavaInfo *pInfo,
     const JavaVMOption *arOptions,
     sal_Int32 nSizeOptions,
@@ -256,7 +257,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
     JFW_PLUGIN_E_ERROR an error occurred during execution.</br>
     JFW_PLUGIN_E_INVALID_ARG pInfo contains invalid data</br>
  */
-javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist);
+JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist);
 
 #ifdef __cplusplus
 }
-- 
cgit