diff options
| author | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2015-04-29 18:18:07 +0300 |
|---|---|---|
| committer | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2015-05-01 19:13:09 +0300 |
| commit | 9cf224322007d90193d4910f0da6e0e29ce01d70 (patch) | |
| tree | 36785ad2f9a25dc40bf88fcbaacc927ac1005db7 | |
| parent | d5a7e00b6b222566a5650639ef29684b047c1909 (diff) | |
| download | libgcrypt-9cf224322007d90193d4910f0da6e0e29ce01d70.tar.gz | |
Cast pointers to integers using uintptr_t instead of long
| -rw-r--r-- | cipher/cipher.c | 4 | ||||
| -rw-r--r-- | cipher/md.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cipher/cipher.c b/cipher/cipher.c index d1550c07..7a29824c 100644 --- a/cipher/cipher.c +++ b/cipher/cipher.c @@ -481,11 +481,11 @@ _gcry_cipher_open_internal (gcry_cipher_hd_t *handle, size_t off = 0; #ifdef NEED_16BYTE_ALIGNED_CONTEXT - if ( ((unsigned long)h & 0x0f) ) + if ( ((uintptr_t)h & 0x0f) ) { /* The malloced block is not aligned on a 16 byte boundary. Correct for this. */ - off = 16 - ((unsigned long)h & 0x0f); + off = 16 - ((uintptr_t)h & 0x0f); h = (void*)((char*)h + off); } #endif /*NEED_16BYTE_ALIGNED_CONTEXT*/ diff --git a/cipher/md.c b/cipher/md.c index 9fef5559..3ab46efc 100644 --- a/cipher/md.c +++ b/cipher/md.c @@ -1148,7 +1148,7 @@ md_stop_debug( gcry_md_hd_t md ) #ifdef HAVE_U64_TYPEDEF { /* a kludge to pull in the __muldi3 for Solaris */ - volatile u32 a = (u32)(ulong)md; + volatile u32 a = (u32)(uintptr_t)md; volatile u64 b = 42; volatile u64 c; c = a * b; |