diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-04-17 18:44:48 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-04-17 18:44:48 +0200 |
| commit | 22bbb0ebe67bc1eb4014d399edcf03340fd6c803 (patch) | |
| tree | 28a62f0221e2c499ee108c205567033dbafa54da /source4/librpc/ndr/ndr_basic.c | |
| parent | c9a12fa55d63e4bccb5b453186022dae1da39032 (diff) | |
| parent | 3180cbbc5b3396da07c325166e472b143b3abe1e (diff) | |
| download | samba-22bbb0ebe67bc1eb4014d399edcf03340fd6c803.tar.gz samba-22bbb0ebe67bc1eb4014d399edcf03340fd6c803.tar.bz2 samba-22bbb0ebe67bc1eb4014d399edcf03340fd6c803.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 43fc10aaa7c3d50cb9fee5ecab859103aec4a62e)
Diffstat (limited to 'source4/librpc/ndr/ndr_basic.c')
| -rw-r--r-- | source4/librpc/ndr/ndr_basic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/librpc/ndr/ndr_basic.c b/source4/librpc/ndr/ndr_basic.c index 93a177f94e..1d2b47c850 100644 --- a/source4/librpc/ndr/ndr_basic.c +++ b/source4/librpc/ndr/ndr_basic.c @@ -196,7 +196,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_hyper(struct ndr_pull *ndr, int ndr_flags, u */ _PUBLIC_ enum ndr_err_code ndr_pull_pointer(struct ndr_pull *ndr, int ndr_flags, void* *v) { - intptr_t h; + uintptr_t h; NDR_PULL_ALIGN(ndr, sizeof(h)); NDR_PULL_NEED_BYTES(ndr, sizeof(h)); memcpy(&h, ndr->data+ndr->offset, sizeof(h)); @@ -393,7 +393,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_hyper(struct ndr_push *ndr, int ndr_flags, u */ _PUBLIC_ enum ndr_err_code ndr_push_pointer(struct ndr_push *ndr, int ndr_flags, void* v) { - intptr_t h = (intptr_t)v; + uintptr_t h = (intptr_t)v; NDR_PUSH_ALIGN(ndr, sizeof(h)); NDR_PUSH_NEED_BYTES(ndr, sizeof(h)); memcpy(ndr->data+ndr->offset, &h, sizeof(h)); |