summaryrefslogtreecommitdiff
path: root/desktop/unx
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 /desktop/unx
parenta3b06ecf4217016c883ce40e52fcd4b6a2d25860 (diff)
Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
Diffstat (limited to 'desktop/unx')
-rw-r--r--desktop/unx/source/start.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index a488f955a319..645cae6844b0 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -6,6 +6,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+
+#include <config_features.h>
+
#include <signal.h>
#include <unistd.h>
#include <limits.h>
@@ -636,7 +639,7 @@ exec_pagein (Args *args)
free (argv[1]);
}
-#if defined SOLAR_JAVA
+#if HAVE_FEATURE_JAVA
static void extend_library_path (const char *new_element)
{
@@ -868,7 +871,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
exec_pagein (args);
/* javaldx */
-#ifdef SOLAR_JAVA
+#if HAVE_FEATURE_JAVA
if (!args->bInhibitJavaLdx)
exec_javaldx (args);
#endif