From 4a08517cac3c68c232694db7288654b58b68b8ba Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Tue, 21 Oct 2014 09:31:07 -0400 Subject: einfo.h, rc.h.in: ensure __BEGIN_DECLS is defined Some Standard C Libraries, like musl, don't define __BEGIN_DECLS or __END_DECLS. We add some ifdef magic to ensure these are available. --- src/libeinfo/einfo.h | 10 ++++++++++ src/librc/rc.h.in | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/libeinfo/einfo.h b/src/libeinfo/einfo.h index 31a891f8..8fe56497 100644 --- a/src/libeinfo/einfo.h +++ b/src/libeinfo/einfo.h @@ -48,6 +48,16 @@ # endif #endif +#undef __BEGIN_DECLS +#undef __END_DECLS +#ifdef __cplusplus +# define __BEGIN_DECLS extern "C" { +# define __END_DECLS } +#else +# define __BEGIN_DECLS /* empty */ +# define __END_DECLS /* empty */ +#endif + __BEGIN_DECLS /*! @brief Color types to use */ diff --git a/src/librc/rc.h.in b/src/librc/rc.h.in index c2a919fc..5cd584f0 100644 --- a/src/librc/rc.h.in +++ b/src/librc/rc.h.in @@ -31,6 +31,16 @@ #include #include +#undef __BEGIN_DECLS +#undef __END_DECLS +#ifdef __cplusplus +# define __BEGIN_DECLS extern "C" { +# define __END_DECLS } +#else +# define __BEGIN_DECLS /* empty */ +# define __END_DECLS /* empty */ +#endif + __BEGIN_DECLS #define RC_PREFIX "@PREFIX@" -- cgit v1.2.3