From 79a36958c69a6f0dd4e08f55e52bcef2bcf75d93 Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 7 Jan 2003 16:50:08 +0000
Subject: [PATCH] * include/posix.h (_Jv_platform_usleep): Wrap in ifdef
JV_HASH_SYNCHRONIZATION. * include/win32.h
(_Jv_platform_usleep): Wrap in ifdef JV_HASH_SYNCHRONIZATION.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@60998 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/ChangeLog | 7 +++++++
libjava/include/posix.h | 4 +++-
libjava/include/win32.h | 2 ++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d33591262c3e..e7e4ae61a166 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 859db6e6ba10..0e1220a10b38 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 8ba6ef2053c5..5de8211a9a97 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
--
GitLab