This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: timezone fixlet
- From: Tom Tromey <tromey at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 13 May 2002 23:40:10 -0600
- Subject: Patch: FYI: timezone fixlet
- Reply-to: tromey at redhat dot com
I'm checking this in on the trunk.
This fixes the build regression I introduced :-(
It didn't fail on my box, but the automated tester found a problem.
This patch just fixes the obvious snafu.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* java/lang/natRuntime.cc: Don't include sys/time.h and time.h.
* java/util/natTimeZone.cc: Include sys/time.h and time.h here.
Include platform.h.
Index: java/lang/natRuntime.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/lang/natRuntime.cc,v
retrieving revision 1.22
diff -u -r1.22 natRuntime.cc
--- java/lang/natRuntime.cc 13 May 2002 20:10:36 -0000 1.22
+++ java/lang/natRuntime.cc 14 May 2002 02:47:59 -0000
@@ -48,17 +48,6 @@
#include <langinfo.h>
#endif
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
#ifdef USE_LTDL
Index: java/util/natTimeZone.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/natTimeZone.cc,v
retrieving revision 1.3
diff -u -r1.3 natTimeZone.cc
--- java/util/natTimeZone.cc 13 May 2002 20:10:37 -0000 1.3
+++ java/util/natTimeZone.cc 14 May 2002 02:47:59 -0000
@@ -13,9 +13,24 @@
#include <gcj/cni.h>
#include <jvm.h>
+#include "platform.h"
+
#include <java/util/TimeZone.h>
#include <java/lang/Character.h>
#include <java/lang/Integer.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
+#include <string.h>
/*
* This method returns a time zone string that is used by init_properties