summaryrefslogtreecommitdiff
path: root/cppu/source/uno
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-08-19 00:41:12 +0300
committerTor Lillqvist <tml@iki.fi>2013-08-19 10:29:04 +0300
commit08452f1208a2ecbf7c6f15a96efeedbe5210ec83 (patch)
treefb09bce47d74d368ae9449bf4a5dc9e33c1ac1a8 /cppu/source/uno
parenta3b06ecf4217016c883ce40e52fcd4b6a2d25860 (diff)
Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
Diffstat (limited to 'cppu/source/uno')
-rw-r--r--cppu/source/uno/lbenv.cxx3
-rw-r--r--cppu/source/uno/lbmap.cxx3
2 files changed, 4 insertions, 2 deletions
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 27a1027c9a6a..79cec37a3637 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_features.h>
#include "cppu/EnvDcp.hxx"
@@ -1056,7 +1057,7 @@ static bool loadEnv(OUString const & cLibStem,
if ( cLibStem == CPPU_CURRENT_LANGUAGE_BINDING_NAME "_uno" )
fpInit = CPPU_ENV_uno_initEnvironment;
-#ifdef SOLAR_JAVA
+#if HAVE_FEATURE_JAVA
else if ( cLibStem == "java_uno" )
fpInit = java_uno_initEnvironment;
#endif
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 65d47760d6ee..6b8e152b4b53 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_features.h>
#include "IdentityMapping.hxx"
@@ -327,7 +328,7 @@ static uno_ext_getMappingFunc selectMapFunc( const OUString & rBridgeName )
{
if (rBridgeName.equalsAscii( CPPU_CURRENT_LANGUAGE_BINDING_NAME "_uno" ))
return CPPU_ENV_uno_ext_getMapping;
-#ifdef SOLAR_JAVA
+#if HAVE_FEATURE_JAVA
if (rBridgeName.equalsAscii( "java" "_uno" ))
return java_uno_ext_getMapping;
#endif