marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This avoids multiple declarations of the same global variable in
different source files.
This commit is contained in:
Samuel Holland 2016-12-13 12:32:57 -06:00 committed by Michael Stapelberg
parent 6f7724ec64
commit 7a7974d76d
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
i3status.c
View File

@ -71,6 +71,11 @@ void **cur_instance;
pthread_t main_thread; 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 * 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 * manner in a signal handler (e.g. fprintf, which we really want to do for

24
include/i3status.h
View File

@ -1,17 +1,23 @@
#ifndef _I3STATUS_H #ifndef _I3STATUS_H
#define _I3STATUS_H #define _I3STATUS_H
enum { O_DZEN2, typedef enum {
O_XMOBAR, O_DZEN2,
O_I3BAR, O_XMOBAR,
O_LEMONBAR, O_I3BAR,
O_TERM, O_LEMONBAR,
O_NONE } output_format; O_TERM,
O_NONE
} output_format_t;
extern output_format_t output_format;
enum { M_PANGO, typedef enum {
M_NONE } markup_format; M_PANGO,
M_NONE
} markup_format_t;
extern markup_format_t markup_format;
char *pct_mark; extern char *pct_mark;
#include <stdbool.h> #include <stdbool.h>
#include <confuse.h> #include <confuse.h>