From 8ef734b0127d79d350319873d3f67b4df2b4f978 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Tue, 31 Aug 2004 21:06:48 +0000 Subject: * configure.ac: Check for sys/time.h, localtime_r, tm_gmtoff in struct tm and for for global timezone variable. * include/Makefile.am: Generate include/java_util_VMTimeZone.h. * include/java_util_TimeZone.h: Removed. * include/java_util_VMTimeZone.h: Added. * java/util/TimeZone.java (defaultZone): Use VMTimeZone. (getDefaultTimeZone): Make package private. Check that GMToffset contains at least one digit. (getDefaultTimeZoneId, readTimeZoneFile, readtzFile): (Re)Moved to VMTimeZone. * vm/reference/java/util/VMTimeZone.java: New file with above methods. * native/jni/java-util/Makefile.am: Compile new java_util_VMTimeZone.c. * native/jni/java-util/java_util_TimeZone.c: Removed. * native/jni/java-util/java_util_VMTimeZone.c: New file. * native/target/generic/target_generic_misc.h (TARGET_NATIVE_MISC_GET_TIMEZONE_STRING): Removed unused macro. * NEWS: Mention TimeZone/VMTimeZone split. --- include/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/Makefile.am') diff --git a/include/Makefile.am b/include/Makefile.am index 5a6b5a88d..942756ff2 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -64,7 +64,7 @@ $(top_srcdir)/include/java_net_NetworkInterface.h \ $(top_srcdir)/include/java_nio_DirectByteBufferImpl.h \ $(top_srcdir)/include/java_nio_MappedByteBufferImpl.h \ $(top_srcdir)/include/java_nio_channels_Channels.h \ -$(top_srcdir)/include/java_util_TimeZone.h +$(top_srcdir)/include/java_util_VMTimeZone.h if CREATE_JNI_HEADERS @@ -188,7 +188,7 @@ $(top_srcdir)/include/java_nio_channels_Channels.h: $(top_srcdir)/java/nio/chann $(JAVAH) -o $@ java.nio.channels.Channels $(top_srcdir)/include/gnu_java_nio_channels_FileChannelImpl.h: $(top_srcdir)/gnu/java/nio/channels/FileChannelImpl.java $(JAVAH) -o $@ gnu.java.nio.channels.FileChannelImpl -$(top_srcdir)/include/java_util_TimeZone.h: $(top_srcdir)/java/util/TimeZone.java - $(JAVAH) -o $@ java.util.TimeZone +$(top_srcdir)/include/java_util_VMTimeZone.h: $(top_srcdir)/vm/reference/java/util/VMTimeZone.java + $(JAVAH) -o $@ java.util.VMTimeZone endif # CREATE_JNI_HEADERS -- cgit v1.2.1