summaryrefslogtreecommitdiff
path: root/source3/librpc
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-04-18 00:30:50 -0700
committerJeremy Allison <jra@samba.org>2008-04-18 00:30:50 -0700
commite90b4061c134486fd3958ea11a28af9801bcc6a2 (patch)
treeef823d86f9ff29339c73ac1d25bbc6015c939ccc /source3/librpc
parent4f46c2d9268ffb418e4f43baf479c03384e2ddda (diff)
downloadsamba-e90b4061c134486fd3958ea11a28af9801bcc6a2.tar.gz
samba-e90b4061c134486fd3958ea11a28af9801bcc6a2.tar.bz2
samba-e90b4061c134486fd3958ea11a28af9801bcc6a2.zip
Janitor for tridge. Keep lib/replace in sync with the gcc4
changes. Jeremy. (This used to be commit b496f133228b74bf613dab81167a5b9670511c51)
Diffstat (limited to 'source3/librpc')
-rw-r--r--source3/librpc/ndr/ndr_basic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/librpc/ndr/ndr_basic.c b/source3/librpc/ndr/ndr_basic.c
index f342c6e36f..c8fa70b185 100644
--- a/source3/librpc/ndr/ndr_basic.c
+++ b/source3/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));