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/lib/util | |
| 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/lib/util')
| -rw-r--r-- | source4/lib/util/util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/util/util.h b/source4/lib/util/util.h index 3bf6b98d2f..ffe83c14b2 100644 --- a/source4/lib/util/util.h +++ b/source4/lib/util/util.h @@ -64,7 +64,7 @@ extern const char *panic_action; makes the return type safe. */ #ifndef discard_const -#define discard_const(ptr) ((void *)((intptr_t)(ptr))) +#define discard_const(ptr) ((void *)((uintptr_t)(ptr))) #endif /** Type-safe version of discard_const */ |