summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-11-06 23:14:59 +0000
committerJeremy Allison <jra@samba.org>2000-11-06 23:14:59 +0000
commit7185f5fbe6a8d1a8e043b693bcbaf9b3e26329ad (patch)
tree36147763c279ae51e244a4161d211c5e1c3e0b87
parent0042bf32cc8eddfc0b89799f19bf6cfa05311f99 (diff)
downloadsamba-7185f5fbe6a8d1a8e043b693bcbaf9b3e26329ad.tar.gz
samba-7185f5fbe6a8d1a8e043b693bcbaf9b3e26329ad.tar.bz2
samba-7185f5fbe6a8d1a8e043b693bcbaf9b3e26329ad.zip
64 bit fix from Uros Prestor <uros@turbolinux.com>.
Jeremy. (This used to be commit 9a5471b3e861aa864ffff5fc87ac2681de7b0068)
-rw-r--r--source3/lib/messages.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 98e9a47179..1cc6700ea9 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -174,7 +174,7 @@ BOOL message_send_pid(pid_t pid, int msg_type, void *buf, size_t len)
if (!p) goto failed;
memcpy(p, &rec, sizeof(rec));
- if (len > 0) memcpy((void *)((unsigned)p+sizeof(rec)), buf, len);
+ if (len > 0) memcpy((void *)((char*)p+sizeof(rec)), buf, len);
dbuf.dptr = p;
dbuf.dsize = len + sizeof(rec);
@@ -188,8 +188,8 @@ BOOL message_send_pid(pid_t pid, int msg_type, void *buf, size_t len)
if (!p) goto failed;
memcpy(p, dbuf.dptr, dbuf.dsize);
- memcpy((void *)((unsigned)p+dbuf.dsize), &rec, sizeof(rec));
- if (len > 0) memcpy((void *)((unsigned)p+dbuf.dsize+sizeof(rec)), buf, len);
+ memcpy((void *)((char*)p+dbuf.dsize), &rec, sizeof(rec));
+ if (len > 0) memcpy((void *)((char*)p+dbuf.dsize+sizeof(rec)), buf, len);
free(dbuf.dptr);
dbuf.dptr = p;