diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-07-15 13:25:56 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:23:10 -0500 |
| commit | 8b80ef14fed24b95c565f942e8787ac3e509ef42 (patch) | |
| tree | 06d93bcdac07774f4bf256932001285d6b5726a7 /source4/librpc/ndr | |
| parent | 7d4004a129c1daf0d9010ff61c45a57d8b19dd2d (diff) | |
| download | samba-8b80ef14fed24b95c565f942e8787ac3e509ef42.tar.gz samba-8b80ef14fed24b95c565f942e8787ac3e509ef42.tar.bz2 samba-8b80ef14fed24b95c565f942e8787ac3e509ef42.zip | |
r8500: greatly reduce the number of build warnings on x86-64 (every NDR macro
in the generated code from pidl generated a warning)
(This used to be commit 22f7fd76343646a149937fcdc891a98a516bf820)
Diffstat (limited to 'source4/librpc/ndr')
| -rw-r--r-- | source4/librpc/ndr/libndr.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h index 2f99c75ce7..b7e06087a7 100644 --- a/source4/librpc/ndr/libndr.h +++ b/source4/librpc/ndr/libndr.h @@ -187,7 +187,7 @@ enum ndr_compression_alg { #define NDR_PULL_NEED_BYTES(ndr, n) do { \ if ((n) > ndr->data_size || ndr->offset + (n) > ndr->data_size) { \ - return ndr_pull_error(ndr, NDR_ERR_BUFSIZE, "Pull bytes %u", n); \ + return ndr_pull_error(ndr, NDR_ERR_BUFSIZE, "Pull bytes %u", (unsigned)n); \ } \ } while(0) @@ -203,7 +203,7 @@ enum ndr_compression_alg { ndr->offset = (ndr->offset + (n-1)) & ~(n-1); \ } \ if (ndr->offset > ndr->data_size) { \ - return ndr_pull_error(ndr, NDR_ERR_BUFSIZE, "Pull align %u", n); \ + return ndr_pull_error(ndr, NDR_ERR_BUFSIZE, "Pull align %u", (unsigned)n); \ } \ } while(0) @@ -229,7 +229,7 @@ enum ndr_compression_alg { (s) = talloc_size(ndr, size); \ if ((size) && !(s)) return ndr_pull_error(ndr, NDR_ERR_ALLOC, \ "Alloc %u failed\n", \ - size); \ + (unsigned)size); \ } while (0) #define NDR_ALLOC(ndr, s) NDR_ALLOC_SIZE(ndr, s, sizeof(*(s))) @@ -237,7 +237,7 @@ enum ndr_compression_alg { #define NDR_ALLOC_N_SIZE(ndr, s, n, elsize) do { \ (s) = talloc_array_size(ndr, elsize, n); \ - if (!(s)) return ndr_pull_error(ndr, NDR_ERR_ALLOC, "Alloc %u * %u failed\n", n, elsize); \ + if (!(s)) return ndr_pull_error(ndr, NDR_ERR_ALLOC, "Alloc %u * %u failed\n", (unsigned)n, (unsigned)elsize); \ } while (0) #define NDR_ALLOC_N(ndr, s, n) NDR_ALLOC_N_SIZE(ndr, s, n, sizeof(*(s))) @@ -245,7 +245,7 @@ enum ndr_compression_alg { #define NDR_PUSH_ALLOC_SIZE(ndr, s, size) do { \ (s) = talloc_size(ndr, size); \ - if (!(s)) return ndr_push_error(ndr, NDR_ERR_ALLOC, "push alloc %u failed\n", size); \ + if (!(s)) return ndr_push_error(ndr, NDR_ERR_ALLOC, "push alloc %u failed\n", (unsigned)size); \ } while (0) #define NDR_PUSH_ALLOC(ndr, s) NDR_PUSH_ALLOC_SIZE(ndr, s, sizeof(*(s))) |