Fix build with gcc-3.4.2

PR:		ports/70114
Submitted by:	Ports Fury
This commit is contained in:
Kirill Ponomarev 2004-08-07 19:11:52 +00:00
parent 8ddbe16b88
commit 419b58ecc3
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=115566
3 changed files with 99 additions and 0 deletions

View file

@ -0,0 +1,35 @@
--- cstream.cc.orig Mon Jul 1 02:08:48 2002
+++ cstream.cc Wed Aug 4 18:09:28 2004
@@ -115,12 +115,13 @@
return true;
}
-UINT ht_compressed_stream::read(void *buf, UINT size)
+UINT ht_compressed_stream::read(void *aBuf, UINT size)
{
UINT ssize = size;
+ byte *buf = (byte *)aBuf;
while (size >= bufferpos) {
memcpy(buf, buffer+buffersize-bufferpos, bufferpos);
- ((byte *)buf) += bufferpos;
+ buf += bufferpos;
size -= bufferpos;
bufferpos = 0;
if (size) {
@@ -134,13 +135,14 @@
return ssize;
}
-UINT ht_compressed_stream::write(const void *buf, UINT size)
+UINT ht_compressed_stream::write(const void *aBuf, UINT size)
{
UINT ssize = size;
+ const byte *buf = (const byte *)aBuf;
while (bufferpos+size >= buffersize) {
memcpy(buffer+bufferpos, buf, buffersize-bufferpos);
size -= buffersize-bufferpos;
- ((byte *)buf) += buffersize-bufferpos;
+ buf += buffersize-bufferpos;
bufferpos = buffersize;
if (size) {
if (!flush_compressed()) return ssize - size;

View file

@ -0,0 +1,46 @@
--- htle.cc.orig Thu Oct 10 03:32:50 2002
+++ htle.cc Wed Aug 4 18:14:34 2004
@@ -475,19 +475,20 @@
return false;
}
-UINT ht_le_page_file::read(void *buf, UINT size)
+UINT ht_le_page_file::read(void *aBuf, UINT size)
{
FILEOFS mofs;
UINT msize;
int c = 0;
while (size) {
UINT s = size;
+ byte *buf = (byte *)aBuf;
if (!map_ofs(ofs, &mofs, &msize)) break;
if (s>msize) s = msize;
streamfile->seek(mofs);
s = streamfile->read(buf, s);
if (!s) break;
- ((byte*)buf) += s;
+ buf += s;
size -= s;
c += s;
ofs += s;
@@ -546,17 +547,18 @@
return ht_layer_streamfile::vcntl(cmd, vargs);
}
-UINT ht_le_page_file::write(const void *buf, UINT size)
+UINT ht_le_page_file::write(const void *aBuf, UINT size)
{
FILEOFS mofs;
UINT msize;
int c = 0;
while (size) {
UINT s = size;
+ const byte *buf = (const byte *)aBuf;
if (!map_ofs(ofs, &mofs, &msize)) break;
if (s>msize) s = msize;
streamfile->seek(mofs);
- ((byte*)buf) += streamfile->write(buf, s);
+ buf += streamfile->write(buf, s);
size -= s;
c += s;
ofs += s;

View file

@ -0,0 +1,18 @@
--- srt/srt_x86.cc.orig Mon Sep 2 02:05:13 2002
+++ srt/srt_x86.cc Wed Aug 4 17:53:58 2004
@@ -60,13 +60,13 @@
k = &cpu->flags[(idx-8) % X86_FLAGS];
(*k)->done();
delete *k;
- ((Object*)*k) = o;
+ k = (sym_bool **)o;
} else {
sym_int **k;
k = &cpu->regs[idx & 7];
(*k)->done();
delete *k;
- ((Object*)*k) = o;
+ k = (sym_int **)o;
}
}