diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-09 18:51:57 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-09 19:08:29 +0100 |
| commit | 220d9c24d0e81668862010ed3e68e4f46fe9924b (patch) | |
| tree | 65fd5bff61508ff2619a36e6242ffc476746290c /include/jvmfwk | |
| parent | 2823f7bd4898ab9ebc7ea2937b9db235dc52ae84 (diff) | |
include/jvmfwk/*.h -> .hxx (only ever included from C++ code)
Change-Id: Ia912e937d5a48afb6f8f5345b20bb7bd517fc4f1
Diffstat (limited to 'include/jvmfwk')
| -rw-r--r-- | include/jvmfwk/framework.hxx (renamed from include/jvmfwk/framework.h) | 12 | ||||
| -rw-r--r-- | include/jvmfwk/jvmfwkdllapi.hxx (renamed from include/jvmfwk/jvmfwkdllapi.h) | 4 |
2 files changed, 5 insertions, 11 deletions
diff --git a/include/jvmfwk/framework.h b/include/jvmfwk/framework.hxx index dea5ec0d3a7e..a85e38b2e796 100644 --- a/include/jvmfwk/framework.h +++ b/include/jvmfwk/framework.hxx @@ -19,17 +19,15 @@ /** @HTML */ -#ifndef INCLUDED_JVMFWK_FRAMEWORK_H -#define INCLUDED_JVMFWK_FRAMEWORK_H +#ifndef INCLUDED_JVMFWK_FRAMEWORK_HXX +#define INCLUDED_JVMFWK_FRAMEWORK_HXX -#include <jvmfwk/jvmfwkdllapi.h> +#include <jvmfwk/jvmfwkdllapi.hxx> #include <rtl/ustring.h> #include <osl/mutex.h> #include "jni.h" -#ifdef __cplusplus extern "C" { -#endif /** @file <p>This library can operate in two modes, application mode and direct mode.</p> @@ -770,11 +768,7 @@ JVMFWK_DLLPUBLIC void SAL_CALL jfw_lock(); */ JVMFWK_DLLPUBLIC void SAL_CALL jfw_unlock(); - -#ifdef __cplusplus } -#endif - #endif diff --git a/include/jvmfwk/jvmfwkdllapi.h b/include/jvmfwk/jvmfwkdllapi.hxx index a4919bf7a7e7..67be38afb6f8 100644 --- a/include/jvmfwk/jvmfwkdllapi.h +++ b/include/jvmfwk/jvmfwkdllapi.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_JVMFWK_JVMFWKDLLAPI_H -#define INCLUDED_JVMFWK_JVMFWKDLLAPI_H +#ifndef INCLUDED_JVMFWK_JVMFWKDLLAPI_HXX +#define INCLUDED_JVMFWK_JVMFWKDLLAPI_HXX #include <sal/types.h> |