Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

aiocb buf field is now volatile void* to bring in line with linux

Browse Source 
This was SVN commit r846.
This commit is contained in:
janwas 2004-07-31 01:50:54 +00:00
parent 5f810002c7
commit 034230a847
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/lib/sysdep/win/waio.cpp
View File

@ -475,7 +475,7 @@ debug_out("aio_rw cb=%p\n", cb);
size_t ofs = 0;
size_t size = cb->aio_nbytes;
void* buf = cb->aio_buf;
void* buf = (void*)cb->aio_buf; // from volatile void*
// check if h is a socket
#define SOL_SOCKET 0xffff
@ -639,7 +639,7 @@ debug_out("aio_return cb=%p\n", cb);
// read wasn't aligned - need to copy to user's buffer
const size_t _buf = (char*)cb->aio_buf - (char*)0;
if(r->pad || _buf % sector_size)
memcpy(cb->aio_buf, (u8*)r->buf + r->pad, cb->aio_nbytes);
memcpy((void*)cb->aio_buf, (u8*)r->buf + r->pad, cb->aio_nbytes);
// TODO: this copies data back into original buffer from align buffer
// when writing from unaligned buffer. unnecessarily slow.

2
source/lib/sysdep/win/waio.h
View File

@ -28,7 +28,7 @@ struct aiocb
{
int aio_fildes; // File descriptor.
off_t aio_offset; // File offset.
void* aio_buf; // Location of buffer.
volatile void* aio_buf; // Location of buffer.
size_t aio_nbytes; // Length of transfer.
int aio_reqprio; // Request priority offset.
struct sigevent aio_sigevent; // Signal number and value.