diff options
| author | Anthony G. Basile <blueness@gentoo.org> | 2014-10-22 07:46:49 -0400 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-10-22 07:46:49 -0400 |
| commit | 86e9aa0d36813e2630c6613cd71c3ce8db642f71 (patch) | |
| tree | e951f00712e33583175ebef669b5a03b3b479d51 | |
| parent | 4a08517cac3c68c232694db7288654b58b68b8ba (diff) | |
einfo.h, rc.h.in: simplify __BEGIN_DECLS logic
There is no need to redefine __BEGIN_DECLS and __END_DECLS.
We simplify the logic here and avoid undefining these macros.
| -rw-r--r-- | src/libeinfo/einfo.h | 17 | ||||
| -rw-r--r-- | src/librc/rc.h.in | 17 |
2 files changed, 14 insertions, 20 deletions
diff --git a/src/libeinfo/einfo.h b/src/libeinfo/einfo.h index 8fe56497..c0325c27 100644 --- a/src/libeinfo/einfo.h +++ b/src/libeinfo/einfo.h @@ -48,18 +48,11 @@ # endif #endif -#undef __BEGIN_DECLS -#undef __END_DECLS +/* __BEGIN_DECLS */ #ifdef __cplusplus -# define __BEGIN_DECLS extern "C" { -# define __END_DECLS } -#else -# define __BEGIN_DECLS /* empty */ -# define __END_DECLS /* empty */ +extern "C" { #endif -__BEGIN_DECLS - /*! @brief Color types to use */ typedef enum { @@ -150,5 +143,9 @@ void eoutdentv(void); /*! @brief Prefix each einfo line with something */ void eprefix(const char * EINFO_RESTRICT); -__END_DECLS +/* __END_DECLS */ +#ifdef __cplusplus +} +#endif + #endif diff --git a/src/librc/rc.h.in b/src/librc/rc.h.in index 5cd584f0..5ef8d7fd 100644 --- a/src/librc/rc.h.in +++ b/src/librc/rc.h.in @@ -31,18 +31,11 @@ #include <stdbool.h> #include <stdio.h> -#undef __BEGIN_DECLS -#undef __END_DECLS +/* __BEGIN_DECLS */ #ifdef __cplusplus -# define __BEGIN_DECLS extern "C" { -# define __END_DECLS } -#else -# define __BEGIN_DECLS /* empty */ -# define __END_DECLS /* empty */ +extern "C" { #endif -__BEGIN_DECLS - #define RC_PREFIX "@PREFIX@" #define RC_SYSCONFDIR "@SYSCONFDIR@" #define RC_LIBDIR "@PREFIX@/@LIB@/rc" @@ -573,5 +566,9 @@ bool rc_getfile(const char *, char **, size_t *); * we have our own */ ssize_t rc_getline(char **, size_t *, FILE *); -__END_DECLS +/* __END_DECLS */ +#ifdef __cplusplus +} +#endif + #endif |