natRuntime.cc: Don't include sys/time.h and time.h.

	* 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.

From-SVN: r53443

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 25233a17b54a13de019b92df092b9ce849be4d4a..bbdd782beb5de40ca3b4c414a3587b09aa85a302 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,9 @@
 2002-05-13  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.
+
        Fixes PR libgcj/6389:
        * Makefile.in: Rebuilt.
        * Makefile.am (nat_source_files): Added natTimeZone.cc.

diff --git a/libjava/java/lang/natRuntime.cc b/libjava/java/lang/natRuntime.cc
index 0783d5b7419ad65e9710f8a6d3c03583ccd77f2d..7511df49a0ffa4330f1b26fc69c98f62c474571a 100644 (file)
--- a/libjava/java/lang/natRuntime.cc
+++ b/libjava/java/lang/natRuntime.cc
@@ -48,17 +48,6 @@ details.  */
 #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
-
 \f
 
 #ifdef USE_LTDL

diff --git a/libjava/java/util/natTimeZone.cc b/libjava/java/util/natTimeZone.cc
index 007f689209f02ada8627cd2b4581ae124b952e5c..7743c612546ac7469f7e01fc3540ffd2b7643f8c 100644 (file)
--- a/libjava/java/util/natTimeZone.cc
+++ b/libjava/java/util/natTimeZone.cc
@@ -13,10 +13,25 @@ details.  */
 #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
  * to set the default timezone property 'user.timezone'.  That value is