diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-03-18 17:23:53 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-03-18 17:23:53 +0000 |
| commit | ab58e556a3be47dfda3d8c4a24d4e24f20a919e5 (patch) | |
| tree | 1fd0133255db912a48f1c52634ee49d19877bb50 /libjava | |
| parent | 2d49f8240d0215badf73b1984dade82a824c2ea0 (diff) | |
| download | gcc-ab58e556a3be47dfda3d8c4a24d4e24f20a919e5.tar.gz | |
* gnu/java/nio/channels/natFileChannelPosix.cc (mapImpl): Cast
MAP_FAILED to void *.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@79627 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -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 df198b15895..83619cf58ab 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 44beae6641d..b8f99378834 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; |