diff options
author | Jeremy Allison <jra@samba.org> | 2005-06-24 20:25:18 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:58:00 -0500 |
commit | 19ca97a70f6b7b41d251eaa76e4d3c980c6eedff (patch) | |
tree | 18d7d81e2c1aa7cf9325899b7e8fc90b41c14c8b /source3/smbd/fileio.c | |
parent | 8387af752f81e26f1c141f6053bf6d106f0af5eb (diff) | |
download | samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.tar.gz samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.tar.xz samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.zip |
r7882: Looks like a large patch - but what it actually does is make Samba
safe for using our headers and linking with C++ modules. Stops us
from using C++ reserved keywords in our code.
Jeremy
(This used to be commit 9506b8e145982b1160a2f0aee5c9b7a54980940a)
Diffstat (limited to 'source3/smbd/fileio.c')
-rw-r--r-- | source3/smbd/fileio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c index 69b8b576428..ba0766c2986 100644 --- a/source3/smbd/fileio.c +++ b/source3/smbd/fileio.c @@ -752,7 +752,7 @@ static BOOL setup_write_cache(files_struct *fsp, SMB_OFF_T file_size) wcp->offset = 0; wcp->alloc_size = alloc_size; wcp->data_size = 0; - if((wcp->data = SMB_MALLOC(wcp->alloc_size)) == NULL) { + if((wcp->data = (char *)SMB_MALLOC(wcp->alloc_size)) == NULL) { DEBUG(0,("setup_write_cache: malloc fail for buffer size %u.\n", (unsigned int)wcp->alloc_size )); SAFE_FREE(wcp); |