diff options
author | Samuel Holland <samuel@sholland.org> | 2016-12-13 12:32:57 -0600 |
---|---|---|
committer | Michael Stapelberg <stapelberg@users.noreply.github.com> | 2016-12-13 19:32:57 +0100 |
commit | 7a7974d76dc9afd66d588148dce1610ec1fab439 (patch) | |
tree | 109e01afdbe1248e1b7da774c3a19c50a71198cc | |
parent | 6f7724ec6425944a09ba6bd14828d1e2fd5b3467 (diff) |
Fix i3status to compile with -fno-common (#185)
This avoids multiple declarations of the same global variable in
different source files.
-rw-r--r-- | i3status.c | 5 | ||||
-rw-r--r-- | include/i3status.h | 24 |
2 files changed, 20 insertions, 9 deletions
@@ -71,6 +71,11 @@ void **cur_instance; pthread_t main_thread; +markup_format_t markup_format; +output_format_t output_format; + +char *pct_mark; + /* * Set the exit_upon_signal flag, because one cannot do anything in a safe * manner in a signal handler (e.g. fprintf, which we really want to do for diff --git a/include/i3status.h b/include/i3status.h index e1b11f9..a0e1e31 100644 --- a/include/i3status.h +++ b/include/i3status.h @@ -1,17 +1,23 @@ #ifndef _I3STATUS_H #define _I3STATUS_H -enum { O_DZEN2, - O_XMOBAR, - O_I3BAR, - O_LEMONBAR, - O_TERM, - O_NONE } output_format; +typedef enum { + O_DZEN2, + O_XMOBAR, + O_I3BAR, + O_LEMONBAR, + O_TERM, + O_NONE +} output_format_t; +extern output_format_t output_format; -enum { M_PANGO, - M_NONE } markup_format; +typedef enum { + M_PANGO, + M_NONE +} markup_format_t; +extern markup_format_t markup_format; -char *pct_mark; +extern char *pct_mark; #include <stdbool.h> #include <confuse.h> |