diff options
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/lang/natRuntime.cc | 11 | ||||
| -rw-r--r-- | libjava/java/util/natTimeZone.cc | 15 |
2 files changed, 15 insertions, 11 deletions
diff --git a/libjava/java/lang/natRuntime.cc b/libjava/java/lang/natRuntime.cc index 0783d5b..7511df4 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 007f689..7743c612 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 |