natFileChannelPosix.cc (mapImpl): Cast MAP_FAILED to void *.

	* gnu/java/nio/channels/natFileChannelPosix.cc (mapImpl): Cast
	MAP_FAILED to void *.

From-SVN: r79627

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index df198b158954aa5dd7b36221c83a848d429a4884..83619cf58abb3467f7ad98ca723bd1149891e5f3 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-18  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+       * gnu/java/nio/channels/natFileChannelPosix.cc (mapImpl): Cast
+       MAP_FAILED to void *.
+
 2004-03-12  Graydon Hoare  <graydon@redhat.com>
 
        * gnu/java/awt/peer/gtk/GdkGraphics2D.java: Clipping fixes.

diff --git a/libjava/gnu/java/nio/channels/natFileChannelPosix.cc b/libjava/gnu/java/nio/channels/natFileChannelPosix.cc
index 44beae6641d30871e6a616fbb70e3787f800bb2d..b8f993788349d30a4a07c52d3e4cb2ea6d8e5dbe 100644 (file)
--- a/libjava/gnu/java/nio/channels/natFileChannelPosix.cc
+++ b/libjava/gnu/java/nio/channels/natFileChannelPosix.cc
@@ -504,7 +504,7 @@ FileChannelImpl::mapImpl (jchar mmode, jlong position, jint size)
   MappedByteBufferImpl *buf
     = new MappedByteBufferImpl ((RawData *) ((char *) ptr + align),
                                size, mmode == 'r');
-  if (ptr == MAP_FAILED)
+  if (ptr == (void *) MAP_FAILED)
     throw new IOException (JvNewStringLatin1 (strerror (errno)));
   buf->implPtr = reinterpret_cast<RawData*> (ptr);
   buf->implLen = size+align;