diff options
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/include/posix.h | 4 | ||||
| -rw-r--r-- | libjava/include/win32.h | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d335912..e7e4ae6 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2003-01-07 Tom Tromey <tromey@redhat.com> + + * include/posix.h (_Jv_platform_usleep): Wrap in ifdef + JV_HASH_SYNCHRONIZATION. + * include/win32.h (_Jv_platform_usleep): Wrap in ifdef + JV_HASH_SYNCHRONIZATION. + 2003-01-07 Michael Koch <konqueror@gmx.de> * java/net/DatagramSocket.java: diff --git a/libjava/include/posix.h b/libjava/include/posix.h index 859db6e..0e1220a 100644 --- a/libjava/include/posix.h +++ b/libjava/include/posix.h @@ -1,6 +1,6 @@ // posix.h -- Helper functions for POSIX-flavored OSs. -/* Copyright (C) 2000, 2002 Free Software Foundation +/* Copyright (C) 2000, 2002, 2003 Free Software Foundation This file is part of libgcj. @@ -60,11 +60,13 @@ _Jv_platform_close_on_exec (jint fd) ::fcntl (fd, F_SETFD, FD_CLOEXEC); } +#ifdef JV_HASH_SYNCHRONIZATION inline void _Jv_platform_usleep (unsigned long usecs) { usleep (usecs); } +#endif /* JV_HASH_SYNCHRONIZATION */ #ifndef DISABLE_JAVA_NET diff --git a/libjava/include/win32.h b/libjava/include/win32.h index 8ba6ef2..5de8211 100644 --- a/libjava/include/win32.h +++ b/libjava/include/win32.h @@ -48,6 +48,7 @@ _Jv_platform_close_on_exec (jint) // Ignore. } +#ifdef JV_HASH_SYNCHRONIZATION /* Suspends the execution of the current thread for the specified number of microseconds. Tries to emulate the behaviour of usleep() on UNIX and provides a granularity of 1 millisecond. */ @@ -60,6 +61,7 @@ _Jv_platform_usleep (unsigned long usecs) Sleep (millis); } } +#endif /* JV_HASH_SYNCHRONIZATION */ #ifndef DISABLE_JAVA_NET |