From 86e9aa0d36813e2630c6613cd71c3ce8db642f71 Mon Sep 17 00:00:00 2001
From: "Anthony G. Basile" <blueness@gentoo.org>
Date: Wed, 22 Oct 2014 07:46:49 -0400
Subject: 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.
---
 src/libeinfo/einfo.h | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/libeinfo')

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
-- 
cgit v1.2.3