diff options
| author | Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> | 2004-03-18 17:23:53 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2004-03-18 17:23:53 +0000 |
| commit | acc63e4c3d942fc6669ee990f0c43b15c41c0592 (patch) | |
| tree | 1fd0133255db912a48f1c52634ee49d19877bb50 | |
| parent | 689ba89dd8da4c7ecad4dab5e98d0d87d4e64383 (diff) | |
| download | gcc-acc63e4c3d942fc6669ee990f0c43b15c41c0592.zip gcc-acc63e4c3d942fc6669ee990f0c43b15c41c0592.tar.gz gcc-acc63e4c3d942fc6669ee990f0c43b15c41c0592.tar.bz2 | |
natFileChannelPosix.cc (mapImpl): Cast MAP_FAILED to void *.
* gnu/java/nio/channels/natFileChannelPosix.cc (mapImpl): Cast
MAP_FAILED to void *.
From-SVN: r79627
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/gnu/java/nio/channels/natFileChannelPosix.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index df198b1..83619cf 100644 --- 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 44beae6..b8f9937 100644 --- 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; |