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
This commit is contained in:
parent
fe4b3c7996
commit
e86c533b01
@ -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.
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user