From 119789424b62321e74a18fc1c088ebf479d999c4 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Thu, 5 Mar 2020 14:27:08 -0800 Subject: [PATCH] libctf: Mark bswap_identity_64 inline function as static. This is similar to cbbbc402e059ee345cb781d3ceb757ae1cc679ee and fixes a link error with duplicately defined symbols on FreeBSD. libctf/ChangeLog: * swap.h (bswap_identity_64): Make static. --- libctf/ChangeLog | 4 ++++ libctf/swap.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libctf/ChangeLog b/libctf/ChangeLog index 9da5827c26..5f7bdf34c2 100644 --- a/libctf/ChangeLog +++ b/libctf/ChangeLog @@ -1,3 +1,7 @@ +2020-03-11 John Baldwin + + * swap.h (bswap_identity_64): Make static. + 2020-01-18 Nick Clifton Binutils 2.34 branch created. diff --git a/libctf/swap.h b/libctf/swap.h index f8cc822db2..d526f7e267 100644 --- a/libctf/swap.h +++ b/libctf/swap.h @@ -43,7 +43,7 @@ bswap_32 (uint32_t v) | ((v & 0x000000ff) << 24)); } -inline uint64_t +static inline uint64_t bswap_identity_64 (uint64_t v) { return v; -- 2.34.1