diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-05-14 05:29:30 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-05-14 05:29:30 +0000 |
| commit | e1461b00682b75526fb48f08b935b7ace4be7aa1 (patch) | |
| tree | 7c2675ea3d84ee24d0c23495cc9a91e9debbf1f5 /libjava | |
| parent | 638987bd9ae31ce99637cbc536d6337c1629aedb (diff) | |
| download | gcc-e1461b00682b75526fb48f08b935b7ace4be7aa1.tar.gz | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@53443 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/java/lang/natRuntime.cc | 11 | ||||
| -rw-r--r-- | libjava/java/util/natTimeZone.cc | 15 |
3 files changed, 19 insertions, 11 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 25233a17b54..bbdd782beb5 100644 --- 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 0783d5b7419..7511df49a0f 100644 --- 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 - #ifdef USE_LTDL diff --git a/libjava/java/util/natTimeZone.cc b/libjava/java/util/natTimeZone.cc index 007f689209f..7743c612546 100644 --- 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 |