aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/lang/natSystem.cc
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/java/lang/natSystem.cc')
-rw-r--r--libjava/java/lang/natSystem.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc
index faeff51..5844246 100644
--- a/libjava/java/lang/natSystem.cc
+++ b/libjava/java/lang/natSystem.cc
@@ -271,7 +271,9 @@ java::lang::System::getSystemTimeZone (void)
tz1 = tzname[0];
tz2 = strcmp (tzname[0], tzname[1]) ? tzname[1] : "";
#else
-#error Neither tm_zone nor tzname defined
+ // Some targets have no concept of timezones.
+ tz1 = "???";
+ tz2 = tz1;
#endif
if ((tzoffset % 3600) == 0)
@@ -464,6 +466,7 @@ java::lang::System::init_properties (void)
}
// Set the system properties from the user's environment.
+#ifndef DISABLE_GETENV_PROPERTIES
if (_Jv_Environment_Properties)
{
size_t i = 0;
@@ -475,6 +478,7 @@ java::lang::System::init_properties (void)
i++;
}
}
+#endif
if (_Jv_Jar_Class_Path)
newprops->put(JvNewStringLatin1 ("java.class.path"),