PatchSet 7583
Date: 2007/10/21 17:40:48
Author: robilad
Branch: HEAD
Tag: (none)
Log:
2007-10-21 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/clib/native/TimeZone.c: Removed, use the version in GNU
Classpath
instead.
* kaffe/kaffevm/Makefile.am (libkaffevm_la_SOURCES): Removed TimeZone.c.
Members:
ChangeLog:1.5080->1.5081
kaffe/kaffevm/Makefile.am:1.100->1.101
kaffe/kaffevm/Makefile.in:1.262->1.263
libraries/clib/native/TimeZone.c:1.9->1.10(DEAD)
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5080 kaffe/ChangeLog:1.5081
--- kaffe/ChangeLog:1.5080 Sun Oct 21 16:08:24 2007
+++ kaffe/ChangeLog Sun Oct 21 17:40:48 2007
@@ -1,5 +1,12 @@
2007-10-21 Dalibor Topic <[EMAIL PROTECTED]>
+ * libraries/clib/native/TimeZone.c: Removed, use the version in GNU
Classpath
+ instead.
+
+ * kaffe/kaffevm/Makefile.am (libkaffevm_la_SOURCES): Removed TimeZone.c.
+
+2007-10-21 Dalibor Topic <[EMAIL PROTECTED]>
+
* TODO: Removed VMProcess top, as VMProcess is now used straight from
GNU Classpath.
Index: kaffe/kaffe/kaffevm/Makefile.am
diff -u kaffe/kaffe/kaffevm/Makefile.am:1.100
kaffe/kaffe/kaffevm/Makefile.am:1.101
--- kaffe/kaffe/kaffevm/Makefile.am:1.100 Sun Jul 1 19:09:13 2007
+++ kaffe/kaffe/kaffevm/Makefile.am Sun Oct 21 17:40:49 2007
@@ -143,7 +143,6 @@
$(top_srcdir)/libraries/clib/native/Constructor.c \
$(top_srcdir)/libraries/clib/native/Field.c \
$(top_srcdir)/libraries/clib/native/Method.c \
- $(top_srcdir)/libraries/clib/native/TimeZone.c \
$(top_srcdir)/libraries/clib/native/Class.c \
$(top_srcdir)/libraries/clib/native/ClassLoader.c \
$(top_srcdir)/libraries/clib/native/java_lang_Object.c \
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.262
kaffe/kaffe/kaffevm/Makefile.in:1.263
--- kaffe/kaffe/kaffevm/Makefile.in:1.262 Tue Aug 7 01:44:48 2007
+++ kaffe/kaffe/kaffevm/Makefile.in Sun Oct 21 17:40:49 2007
@@ -119,12 +119,11 @@
libkaffevm_la-java_lang_ref_Reference.lo \
libkaffevm_la-java_lang_reflect_VMArray.lo \
libkaffevm_la-Constructor.lo libkaffevm_la-Field.lo \
- libkaffevm_la-Method.lo libkaffevm_la-TimeZone.lo \
- libkaffevm_la-Class.lo libkaffevm_la-ClassLoader.lo \
- libkaffevm_la-java_lang_Object.lo libkaffevm_la-Runtime.lo \
- libkaffevm_la-VMRuntime.lo libkaffevm_la-java_lang_String.lo \
- libkaffevm_la-System.lo libkaffevm_la-java_lang_Thread.lo \
- libkaffevm_la-Throwable.lo \
+ libkaffevm_la-Method.lo libkaffevm_la-Class.lo \
+ libkaffevm_la-ClassLoader.lo libkaffevm_la-java_lang_Object.lo \
+ libkaffevm_la-Runtime.lo libkaffevm_la-VMRuntime.lo \
+ libkaffevm_la-java_lang_String.lo libkaffevm_la-System.lo \
+ libkaffevm_la-java_lang_Thread.lo libkaffevm_la-Throwable.lo \
libkaffevm_la-gnu_classpath_VMStackWalker.lo \
libkaffevm_la-gnu_classpath_VMSystemProperties.lo
libkaffevm_la_OBJECTS = $(am_libkaffevm_la_OBJECTS)
@@ -491,7 +490,6 @@
$(top_srcdir)/libraries/clib/native/Constructor.c \
$(top_srcdir)/libraries/clib/native/Field.c \
$(top_srcdir)/libraries/clib/native/Method.c \
- $(top_srcdir)/libraries/clib/native/TimeZone.c \
$(top_srcdir)/libraries/clib/native/Class.c \
$(top_srcdir)/libraries/clib/native/ClassLoader.c \
$(top_srcdir)/libraries/clib/native/java_lang_Object.c \
@@ -659,7 +657,6 @@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@@ -983,13 +980,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@
source='$(top_srcdir)/libraries/clib/native/Method.c'
object='libkaffevm_la-Method.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS)
$(CPPFLAGS) $(libkaffevm_la_CFLAGS) $(CFLAGS) -c -o libkaffevm_la-Method.lo
`test -f '$(top_srcdir)/libraries/clib/native/Method.c' || echo
'$(srcdir)/'`$(top_srcdir)/libraries/clib/native/Method.c
-
-libkaffevm_la-TimeZone.lo: $(top_srcdir)/libraries/clib/native/TimeZone.c
[EMAIL PROTECTED]@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS)
$(CPPFLAGS) $(libkaffevm_la_CFLAGS) $(CFLAGS) -MT libkaffevm_la-TimeZone.lo -MD
-MP -MF $(DEPDIR)/libkaffevm_la-TimeZone.Tpo -c -o libkaffevm_la-TimeZone.lo
`test -f '$(top_srcdir)/libraries/clib/native/TimeZone.c' || echo
'$(srcdir)/'`$(top_srcdir)/libraries/clib/native/TimeZone.c
[EMAIL PROTECTED]@ mv -f $(DEPDIR)/libkaffevm_la-TimeZone.Tpo
$(DEPDIR)/libkaffevm_la-TimeZone.Plo
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@
source='$(top_srcdir)/libraries/clib/native/TimeZone.c'
object='libkaffevm_la-TimeZone.lo' libtool=yes @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS)
$(CPPFLAGS) $(libkaffevm_la_CFLAGS) $(CFLAGS) -c -o libkaffevm_la-TimeZone.lo
`test -f '$(top_srcdir)/libraries/clib/native/TimeZone.c' || echo
'$(srcdir)/'`$(top_srcdir)/libraries/clib/native/TimeZone.c
libkaffevm_la-Class.lo: $(top_srcdir)/libraries/clib/native/Class.c
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS)
$(CPPFLAGS) $(libkaffevm_la_CFLAGS) $(CFLAGS) -MT libkaffevm_la-Class.lo -MD
-MP -MF $(DEPDIR)/libkaffevm_la-Class.Tpo -c -o libkaffevm_la-Class.lo `test -f
'$(top_srcdir)/libraries/clib/native/Class.c' || echo
'$(srcdir)/'`$(top_srcdir)/libraries/clib/native/Class.c
===================================================================
Checking out kaffe/libraries/clib/native/TimeZone.c
RCS: /home/cvs/kaffe/kaffe/libraries/clib/native/Attic/TimeZone.c,v
VERS: 1.9
***************
--- kaffe/libraries/clib/native/TimeZone.c Sun Oct 21 17:42:23 2007
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,45 +0,0 @@
-/*
- * java.util.TimeZone.c
- *
- * Copyright (c) 2003, 2004
- * The Kaffe.org's team.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file.
- *
- * PORTABILITY NOTES
- * tm->tm_zone is the preferred way to access time zone name
- * on other sytem the use of the external
- * extern char *tzname[]
- * is attempted.
- * On some systems the external symbol is present in the libc but is not
exported in the headers
- * I suggest in that case to put it in the respective md.h of that platform.
- */
-#include "config.h"
-#include "config-std.h"
-
-#if defined (HAVE_TIME_H)
-#include <time.h>
-#endif
-
-#include <native.h>
-#include "java_util_VMTimeZone.h"
-
-struct Hjava_lang_String*
-java_util_VMTimeZone_getSystemTimeZoneId(void)
-{
- const char *tempZoneName = NULL;
-#if defined(HAVE_TM_ZONE)
- struct tm *tempTimeStruct;
- time_t tempTimeArithm;
-
- tempTimeArithm = 0;
- tempTimeStruct = localtime (&tempTimeArithm);
- tempZoneName = tempTimeStruct->tm_zone;
-#elif defined(HAVE_TZNAME)
- tzset();
- tempZoneName = tzname[0]; /* read above for this external
symbol */
-#endif /* defined(HAVE_TM_ZONE) */
- assert(tempZoneName != NULL);
- return stringC2Java(tempZoneName);
-}
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
