Fix i3status to compile with -fno-common (#185)

This avoids multiple declarations of the same global variable in
different source files.

diff --git a/i3status.c b/i3status.c
index 1968a97a9e7ab852a052e6f4fef61625d88bbdf3..3b9ab7214681d458356b4ef9b5c3db8becf0a753 100644 (file)
--- a/i3status.c
+++ b/i3status.c
@@ -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 e1b11f976b838ded392b9ea557823391d9f60fdf..a0e1e31b7b6a5276438257e5d26f35dffdb9df15 100644 (file)
--- 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>