diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-19 00:41:12 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-19 10:29:04 +0300 |
| commit | 08452f1208a2ecbf7c6f15a96efeedbe5210ec83 (patch) | |
| tree | fb09bce47d74d368ae9449bf4a5dc9e33c1ac1a8 /include | |
| parent | a3b06ecf4217016c883ce40e52fcd4b6a2d25860 (diff) | |
Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/connectivity/CommonTools.hxx | 6 | ||||
| -rw-r--r-- | include/uno/environment.h | 5 | ||||
| -rw-r--r-- | include/uno/mapping.h | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/include/connectivity/CommonTools.hxx b/include/connectivity/CommonTools.hxx index 294ec3f0a3a8..46ced87c8931 100644 --- a/include/connectivity/CommonTools.hxx +++ b/include/connectivity/CommonTools.hxx @@ -19,6 +19,8 @@ #ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #define _CONNECTIVITY_COMMONTOOLS_HXX_ +#include <config_features.h> + #include <rtl/ref.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/lang/DisposedException.hpp> @@ -41,7 +43,7 @@ namespace com { namespace sun { namespace star { namespace util { } }}} -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA namespace jvmaccess { class VirtualMachine; } #endif @@ -155,7 +157,7 @@ namespace connectivity OOO_DLLPUBLIC_DBTOOLS void checkDisposed(sal_Bool _bThrow) throw ( ::com::sun::star::lang::DisposedException ); -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA /** creates a java virtual machine @param _rxContext The ORB. diff --git a/include/uno/environment.h b/include/uno/environment.h index e76ed2fc7ba6..35933ef956f5 100644 --- a/include/uno/environment.h +++ b/include/uno/environment.h @@ -261,12 +261,11 @@ typedef void (SAL_CALL * uno_initEnvironmentFunc)( uno_Environment * pEnv ); /* We link statically and have just the C++ environment */ void SAL_CALL CPPU_ENV_uno_initEnvironment( uno_Environment * Env ) SAL_THROW_EXTERN_C(); -#ifdef SOLAR_JAVA -/* We also have the Java environment */ + +/* We might also have the Java environment */ void SAL_CALL java_uno_initEnvironment( uno_Environment * Env ) SAL_THROW_EXTERN_C(); #endif -#endif /** Gets a specific environment. If the specified environment does not exist, then a default one is created and registered. The environment revokes itself on last release() call. diff --git a/include/uno/mapping.h b/include/uno/mapping.h index 179f41f869c9..fd6c4527c058 100644 --- a/include/uno/mapping.h +++ b/include/uno/mapping.h @@ -194,14 +194,12 @@ void SAL_CALL CPPU_ENV_uno_ext_getMapping( struct _uno_Environment * pTo ) SAL_THROW_EXTERN_C(); -#ifdef SOLAR_JAVA /* This is the uno_ext_getMapping function in the Java/UNO bridge */ void SAL_CALL java_uno_ext_getMapping( struct _uno_Mapping ** ppMapping, struct _uno_Environment * pFrom, struct _uno_Environment * pTo ) SAL_THROW_EXTERN_C(); -#endif #endif |