include/jvmfwk/jvmfwkdllapi.h | 1
include/jvmfwk/vendorplugin.h | 257 --------------------
jvmfwk/Library_jvmfwk.mk | 5
jvmfwk/inc/vendorplugin.hxx | 247 +++++++++++++++++++
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 6
jvmfwk/source/framework.cxx | 2
jvmfwk/source/framework.hxx | 4
7 files changed, 256 insertions(+), 266 deletions(-)
New commits:
commit 04a290b107ac0c0c7b1e03da541a4a0c315743e1
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Oct 9 18:08:19 2014 +0200
vendorplugin.h is jvmfwk-internal (and no need for extern "C")
Change-Id: I954f789d5850e8016f5900812f9aa99be2416ce4
diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk
index 5b99f58..15f1a26 100644
--- a/jvmfwk/Library_jvmfwk.mk
+++ b/jvmfwk/Library_jvmfwk.mk
@@ -19,6 +19,11 @@ $(eval $(call gb_Library_add_defs,jvmfwk,\
))
endif
+$(eval $(call gb_Library_set_include,jvmfwk,\
+ -I$(SRCDIR)/jvmfwk/inc \
+ $$(INCLUDE) \
+))
+
$(eval $(call gb_Library_use_api,jvmfwk,\
udkapi \
))
diff --git a/include/jvmfwk/vendorplugin.h b/jvmfwk/inc/vendorplugin.hxx
similarity index 98%
rename from include/jvmfwk/vendorplugin.h
rename to jvmfwk/inc/vendorplugin.hxx
index d51943e..02ea040 100644
--- a/include/jvmfwk/vendorplugin.h
+++ b/jvmfwk/inc/vendorplugin.hxx
@@ -18,18 +18,13 @@
*/
/** @HTML */
-#ifndef INCLUDED_JVMFWK_VENDORPLUGIN_H
-#define INCLUDED_JVMFWK_VENDORPLUGIN_H
+#ifndef INCLUDED_JVMFWK_INC_VENDORPLUGIN_HXX
+#define INCLUDED_JVMFWK_INC_VENDORPLUGIN_HXX
#include <jvmfwk/framework.h>
#include <rtl/ustring.h>
#include "jni.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
/**
@file
<p>
@@ -247,11 +242,6 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
*/
javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist);
-#ifdef __cplusplus
-}
-#endif
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index ab5153d..d1e02ce 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -51,7 +51,7 @@
#include "jni.h"
#include "rtl/byteseq.hxx"
-#include "jvmfwk/vendorplugin.h"
+#include "vendorplugin.hxx"
#include "util.hxx"
#include "sunversion.hxx"
#include "vendorlist.hxx"
@@ -200,7 +200,6 @@ extern "C" void JNICALL abort_handler()
}
-extern "C"
javaPluginError jfw_plugin_getAllJavaInfos(
rtl_uString *sVendor,
rtl_uString *sMinVersion,
@@ -330,7 +329,6 @@ javaPluginError jfw_plugin_getAllJavaInfos(
return JFW_PLUGIN_E_NONE;
}
-extern "C"
javaPluginError jfw_plugin_getJavaInfoByPath(
rtl_uString *path,
rtl_uString *sVendor,
@@ -585,7 +583,6 @@ static void do_msvcr_magic(rtl_uString *jvm_dll)
during instantiation.
</p>
*/
-extern "C"
javaPluginError jfw_plugin_startJavaVirtualMachine(
const JavaInfo *pInfo,
const JavaVMOption* arOptions,
@@ -782,7 +779,6 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
return errorcode;
}
-extern "C"
javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist)
{
javaPluginError ret = JFW_PLUGIN_E_NONE;
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index cd7d551..bdb75f7 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -23,7 +23,7 @@
#include "osl/thread.hxx"
#include "osl/file.hxx"
#include "jvmfwk/framework.h"
-#include "jvmfwk/vendorplugin.h"
+#include "vendorplugin.hxx"
#include <cassert>
#include <vector>
#include <functional>
diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx
index 808bff5..0d0ba18 100644
--- a/jvmfwk/source/framework.hxx
+++ b/jvmfwk/source/framework.hxx
@@ -22,9 +22,9 @@
#include "rtl/ustring.hxx"
#include "rtl/byteseq.hxx"
#include "jvmfwk/framework.h"
-#include "jvmfwk/vendorplugin.h"
+#include "vendorplugin.hxx"
-/** typedefs for functions from vendorplugin.h
+/** typedefs for functions from vendorplugin.hxx
*/
typedef javaPluginError (*jfw_plugin_getAllJavaInfos_ptr)(
rtl_uString * sVendor,
commit 0ef36a8d631bf891db9ada80e6a213c8b08392b7
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Oct 9 17:56:25 2014 +0200
Remove unused JVMFWK_DLLPRIVATE
Change-Id: I9b562e085e0b2a446a16ff5189c1d6b03c0d924b
diff --git a/include/jvmfwk/jvmfwkdllapi.h b/include/jvmfwk/jvmfwkdllapi.h
index 52c8273..a4919bf 100644
--- a/include/jvmfwk/jvmfwkdllapi.h
+++ b/include/jvmfwk/jvmfwkdllapi.h
@@ -17,7 +17,6 @@
#else
# define JVMFWK_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
-#define JVMFWK_DLLPRIVATE SAL_DLLPRIVATE
#endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
