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 /jvmfwk | |
parent | 2823f7bd4898ab9ebc7ea2937b9db235dc52ae84 (diff) |
include/jvmfwk/*.h -> .hxx (only ever included from C++ code)
Change-Id: Ia912e937d5a48afb6f8f5345b20bb7bd517fc4f1
Diffstat (limited to 'jvmfwk')
-rw-r--r-- | jvmfwk/inc/vendorplugin.hxx | 6 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 2 | ||||
-rw-r--r-- | jvmfwk/source/elements.hxx | 2 | ||||
-rw-r--r-- | jvmfwk/source/framework.cxx | 2 | ||||
-rw-r--r-- | jvmfwk/source/framework.hxx | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/jvmfwk/inc/vendorplugin.hxx b/jvmfwk/inc/vendorplugin.hxx index 5ebd4c4e209c..a108cb3c5b4a 100644 --- a/jvmfwk/inc/vendorplugin.hxx +++ b/jvmfwk/inc/vendorplugin.hxx @@ -21,7 +21,7 @@ #ifndef INCLUDED_JVMFWK_INC_VENDORPLUGIN_HXX #define INCLUDED_JVMFWK_INC_VENDORPLUGIN_HXX -#include <jvmfwk/framework.h> +#include <jvmfwk/framework.hxx> #include <rtl/ref.hxx> #include <rtl/ustring.h> #include "jni.h" @@ -74,7 +74,7 @@ typedef enum <p> The function allocates memory for an array and all the JavaInfo objects returned in <code>parJavaInfo</code>. The caller must free each JavaInfo object by calling - <code>jfw_freeJavaInfo</code> (#include "jvmfwk/framework.h"). The array is to be + <code>jfw_freeJavaInfo</code> (#include "jvmfwk/framework.hxx"). The array is to be freed by rtl_freeMemory. In case an error occurred <code>parJavaInfo</code> need not be freed. </p> @@ -218,7 +218,7 @@ javaPluginError jfw_plugin_getJavaInfoFromJavaHome( <p> The function allocates memory for all the JavaInfo objects returned in <code>vecJavaInfosFromPath</code>. The caller must free each JavaInfo object by calling - <code>jfw_freeJavaInfo</code> (#include "jvmfwk/framework.h"). + <code>jfw_freeJavaInfo</code> (#include "jvmfwk/framework.hxx"). </p> @param vecVendorInfos [in] vector specifying the vendor and version requirements that the JRE must fulfill. diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx index 449c26b6f3fa..748b7d7d45d4 100644 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx @@ -26,7 +26,7 @@ #include "osl/thread.h" #include "rtl/ustring.hxx" #include "rtl/byteseq.hxx" -#include "jvmfwk/framework.h" +#include "jvmfwk/framework.hxx" static bool hasOption(char const * szOption, int argc, char** argv); diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx index 21f48baac395..18d50f374456 100644 --- a/jvmfwk/source/elements.hxx +++ b/jvmfwk/source/elements.hxx @@ -20,7 +20,7 @@ #define INCLUDED_JVMFWK_SOURCE_ELEMENTS_HXX #include <vector> -#include "jvmfwk/framework.h" +#include "jvmfwk/framework.hxx" #include "fwkutil.hxx" #include "rtl/ustring.hxx" #include "rtl/byteseq.hxx" diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 41269431dd31..501bf7143a0c 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -22,7 +22,7 @@ #include "rtl/bootstrap.hxx" #include "osl/thread.hxx" #include "osl/file.hxx" -#include "jvmfwk/framework.h" +#include "jvmfwk/framework.hxx" #include "vendorplugin.hxx" #include <cassert> #include <vector> diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx index 1b4c9ed73a98..5ae25d5286c5 100644 --- a/jvmfwk/source/framework.hxx +++ b/jvmfwk/source/framework.hxx @@ -21,7 +21,7 @@ #include "rtl/ustring.hxx" #include "rtl/byteseq.hxx" -#include "jvmfwk/framework.h" +#include "jvmfwk/framework.hxx" #include "vendorplugin.hxx" /** typedefs for functions from vendorplugin.hxx |