proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 11:25:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: fix random C++ compat problem w/ printfrr

Browse Source 
These hoops to get warnings for mis-printing `uint64_t` are apparently
breaking some C++ bits...

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2021-03-16 11:03:50 +01:00 committed by David Lamparter
parent 8dff30f801
commit 4f1a6d98da
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/compiler.h
View File

@ -373,6 +373,10 @@ CPP_NOTICE("time to remove this CONFDATE block")
#else /* !_FRR_ATTRIBUTE_PRINTFRR */ #else /* !_FRR_ATTRIBUTE_PRINTFRR */
#define PRINTFRR(a, b) __attribute__((format(printf, a, b))) #define PRINTFRR(a, b) __attribute__((format(printf, a, b)))
/* frr-format plugin is C-only for now, so no point in doing these shenanigans
* for C++... (also they can break some C++ stuff...)
*/
#ifndef __cplusplus
/* these should be typedefs, but might also be #define */ /* these should be typedefs, but might also be #define */
#ifdef uint64_t #ifdef uint64_t
#undef uint64_t #undef uint64_t
@ -400,6 +404,8 @@ _Static_assert(sizeof(_uint64_t) == 8 && sizeof(_int64_t) == 8,
#define PRIu64 "llu" #define PRIu64 "llu"
#define PRId64 "lld" #define PRId64 "lld"
#define PRIx64 "llx" #define PRIx64 "llx"
#endif /* !__cplusplus */
#endif /* !_FRR_ATTRIBUTE_PRINTFRR */ #endif /* !_FRR_ATTRIBUTE_PRINTFRR */
#ifdef __cplusplus #ifdef __cplusplus