summaryrefslogtreecommitdiff
path: root/src/basic/terminal-util.h
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-03-06 09:34:03 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-03-06 10:41:41 +0100
commitf6a8265b9a00a0a9232bfaf0cd5d3962fbc4700a (patch)
tree4c5dd73e95c6d189533dd0ab64125df7c6c2c492 /src/basic/terminal-util.h
parenteef03d70c1bedb3aabd4e2bcf10ab1f2678443bf (diff)
downloadsystemd-f6a8265b9a00a0a9232bfaf0cd5d3962fbc4700a.tar.gz
core: drop unnecessary __useless_struct_to_allow_trailing_semicolon__
ISO C does not allow empty statements outside of functions, and gcc will warn the trailing semicolons when compiling with -pedantic: warning: ISO C does not allow extra ‘;’ outside of a function [-Wpedantic] But our code cannot compile with -pedantic anyway, at least because warning: ISO C does not support ‘__PRETTY_FUNCTION__’ predefined identifier [-Wpedantic] Without -pedatnic, clang and even old gcc (3.4) generate no warnings about those semicolons, so let's just drop __useless_struct_to_allow_trailing_semicolon__.
Diffstat (limited to 'src/basic/terminal-util.h')
-rw-r--r--src/basic/terminal-util.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/basic/terminal-util.h b/src/basic/terminal-util.h
index b57157e3bb..e92b6987e8 100644
--- a/src/basic/terminal-util.h
+++ b/src/basic/terminal-util.h
@@ -133,16 +133,13 @@ bool dev_console_colors_enabled(void);
#define DEFINE_ANSI_FUNC(name, NAME) \
static inline const char *ansi_##name(void) { \
return colors_enabled() ? ANSI_##NAME : ""; \
- } \
- struct __useless_struct_to_allow_trailing_semicolon__
+ }
#define DEFINE_ANSI_FUNC_UNDERLINE(name, NAME, REPLACEMENT) \
static inline const char *ansi_##name(void) { \
return underline_enabled() ? ANSI_##NAME : \
colors_enabled() ? ANSI_##REPLACEMENT : ""; \
- } \
- struct __useless_struct_to_allow_trailing_semicolon__
-
+ }
DEFINE_ANSI_FUNC(highlight, HIGHLIGHT);
DEFINE_ANSI_FUNC(highlight_red, HIGHLIGHT_RED);