diff options
author | Gerald Carter <jerry@samba.org> | 2005-09-30 17:13:37 +0000 |
---|---|---|
committer | Gerald Carter <jerry@samba.org> | 2005-09-30 17:13:37 +0000 |
commit | 796cade5585f1237e2c047293ad6a9b8a4e923ba (patch) | |
tree | 5f3a22ba40783ce548328a44b9262a451f33ad27 /source/lib/dmallocmsg.c | |
parent | 38730479cfd0c1d46fcb8950fc30da3fa3f8b154 (diff) | |
download | samba-796cade5585f1237e2c047293ad6a9b8a4e923ba.tar.gz samba-796cade5585f1237e2c047293ad6a9b8a4e923ba.tar.xz samba-796cade5585f1237e2c047293ad6a9b8a4e923ba.zip |
r10656: BIG merge from trunk. Features not copied over
* \PIPE\unixinfo
* winbindd's {group,alias}membership new functions
* winbindd's lookupsids() functionality
* swat (trunk changes to be reverted as per discussion with Deryck)
Diffstat (limited to 'source/lib/dmallocmsg.c')
-rw-r--r-- | source/lib/dmallocmsg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/lib/dmallocmsg.c b/source/lib/dmallocmsg.c index a83ed518d7c..1b2308ecba6 100644 --- a/source/lib/dmallocmsg.c +++ b/source/lib/dmallocmsg.c @@ -35,7 +35,7 @@ static unsigned long our_dm_mark = 0; * Respond to a POOL_USAGE message by sending back string form of memory * usage stats. **/ -static void msg_req_dmalloc_mark(int UNUSED(msg_type), pid_t UNUSED(src_pid), +static void msg_req_dmalloc_mark(int UNUSED(msg_type), struct process_id UNUSED(src_pid), void *UNUSED(buf), size_t UNUSED(len)) { #ifdef ENABLE_DMALLOC @@ -49,7 +49,7 @@ static void msg_req_dmalloc_mark(int UNUSED(msg_type), pid_t UNUSED(src_pid), static void msg_req_dmalloc_log_changed(int UNUSED(msg_type), - pid_t UNUSED(src_pid), + struct process_id UNUSED(src_pid), void *UNUSED(buf), size_t UNUSED(len)) { #ifdef ENABLE_DMALLOC |