emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

einfo.h, rc.h.in: simplify __BEGIN_DECLS logic

Browse Source 
There is no need to redefine __BEGIN_DECLS and __END_DECLS.
We simplify the logic here and avoid undefining these macros.
This commit is contained in:
Anthony G. Basile 2014-10-22 07:46:49 -04:00
parent 4a08517cac
commit 86e9aa0d36
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libeinfo/einfo.h
View File

@ -48,18 +48,11 @@
# endif # endif
#endif #endif
#undef __BEGIN_DECLS /* __BEGIN_DECLS */
#undef __END_DECLS
#ifdef __cplusplus #ifdef __cplusplus
# define __BEGIN_DECLS extern "C" { extern "C" {
# define __END_DECLS }
#else
# define __BEGIN_DECLS /* empty */
# define __END_DECLS /* empty */
#endif #endif
__BEGIN_DECLS
/*! @brief Color types to use */ /*! @brief Color types to use */
typedef enum typedef enum
{ {
@ -150,5 +143,9 @@ void eoutdentv(void);
/*! @brief Prefix each einfo line with something */ /*! @brief Prefix each einfo line with something */
void eprefix(const char * EINFO_RESTRICT); void eprefix(const char * EINFO_RESTRICT);
__END_DECLS /* __END_DECLS */
#ifdef __cplusplus
}
#endif
#endif #endif

17
src/librc/rc.h.in
View File

@ -31,18 +31,11 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#undef __BEGIN_DECLS /* __BEGIN_DECLS */
#undef __END_DECLS
#ifdef __cplusplus #ifdef __cplusplus
# define __BEGIN_DECLS extern "C" { extern "C" {
# define __END_DECLS }
#else
# define __BEGIN_DECLS /* empty */
# define __END_DECLS /* empty */
#endif #endif
__BEGIN_DECLS
#define RC_PREFIX "@PREFIX@" #define RC_PREFIX "@PREFIX@"
#define RC_SYSCONFDIR "@SYSCONFDIR@" #define RC_SYSCONFDIR "@SYSCONFDIR@"
#define RC_LIBDIR "@PREFIX@/@LIB@/rc" #define RC_LIBDIR "@PREFIX@/@LIB@/rc"
@ -573,5 +566,9 @@ bool rc_getfile(const char *, char **, size_t *);
* we have our own */ * we have our own */
ssize_t rc_getline(char **, size_t *, FILE *); ssize_t rc_getline(char **, size_t *, FILE *);
__END_DECLS /* __END_DECLS */
#ifdef __cplusplus
}
#endif
#endif #endif