diff options
| author | Yonggang Luo <luoyonggang@gmail.com> | 2022-10-21 02:25:52 +0800 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2022-12-12 14:07:56 +0100 |
| commit | 78dd3b32edf55fc8bdc6268163d5d743a84b1075 (patch) | |
| tree | e991022a0c6634ec65ab8fb5a5659d0683d2e561 | |
| parent | dab89fba0e84c948fb270e541d1d1313afd2c2c3 (diff) | |
| download | elfutils-78dd3b32edf55fc8bdc6268163d5d743a84b1075.tar.gz | |
libdw: Change typeof -> __typeof in memory-access.h
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
| -rw-r--r-- | libdw/ChangeLog | 7 | ||||
| -rw-r--r-- | libdw/memory-access.h | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/libdw/ChangeLog b/libdw/ChangeLog index 6cbf192d..019c6580 100644 --- a/libdw/ChangeLog +++ b/libdw/ChangeLog @@ -1,3 +1,10 @@ +2022-10-21 Yonggang Luo <luoyonggang@gmail.com> + + * memory-access.h (get_uleb128_step): Use __typeof. + (get_sleb128_step): Likewise. + (__libdw_get_sleb128) Likewise. + (__libdw_get_sleb128_unchecked): Likewise. + 2022-11-03 Mark Wielaard <mark@klomp.org> * dwarf_next_cfi.c (dwarf_next_cfi): Don't dereference and assign diff --git a/libdw/memory-access.h b/libdw/memory-access.h index 16c8c851..fca4129a 100644 --- a/libdw/memory-access.h +++ b/libdw/memory-access.h @@ -64,7 +64,7 @@ __libdw_max_len_sleb128 (const unsigned char *addr, const unsigned char *end) #define get_uleb128_step(var, addr, nth) \ do { \ unsigned char __b = *(addr)++; \ - (var) |= (typeof (var)) (__b & 0x7f) << ((nth) * 7); \ + (var) |= (__typeof (var)) (__b & 0x7f) << ((nth) * 7); \ if (likely ((__b & 0x80) == 0)) \ return (var); \ } while (0) @@ -112,11 +112,11 @@ __libdw_get_uleb128_unchecked (const unsigned char **addrp) #define get_sleb128_step(var, addr, nth) \ do { \ unsigned char __b = *(addr)++; \ - (var) |= (typeof (var)) (__b & 0x7f) << ((nth) * 7); \ + (var) |= (__typeof (var)) (__b & 0x7f) << ((nth) * 7); \ if (likely ((__b & 0x80) == 0)) \ { \ if ((__b & 0x40) != 0) \ - (var) |= - ((typeof (var)) 1 << (((nth) + 1) * 7)); \ + (var) |= - ((__typeof (var)) 1 << (((nth) + 1) * 7)); \ return (var); \ } \ } while (0) @@ -146,7 +146,7 @@ __libdw_get_sleb128 (const unsigned char **addrp, const unsigned char *end) { /* We only need the low bit of the final byte, and as it is the sign bit, we don't need to do anything else here. */ - acc |= ((typeof (acc)) b) << 7 * max; + acc |= ((__typeof (acc)) b) << 7 * max; return acc; } @@ -179,7 +179,7 @@ __libdw_get_sleb128_unchecked (const unsigned char **addrp) { /* We only need the low bit of the final byte, and as it is the sign bit, we don't need to do anything else here. */ - acc |= ((typeof (acc)) b) << 7 * max; + acc |= ((__typeof (acc)) b) << 7 * max; return acc; } |