diff options
author | Michael Stapelberg <michael@stapelberg.de> | 2013-02-10 17:19:56 +0100 |
---|---|---|
committer | Michael Stapelberg <michael@stapelberg.de> | 2013-02-10 17:19:56 +0100 |
commit | 78cd0e1e0165b59638e4bf0af2e48612bd35fb1b (patch) | |
tree | 7a041118402c16404c1bf8e52550123816520cca /include | |
parent | 2ebe1f37269e9bec23a3f0c2e6be956884c7ab92 (diff) |
s/\<timezone\>/tz/ in order to not shadow the timezone var from time.h
Diffstat (limited to 'include')
-rw-r--r-- | include/i3status.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/i3status.h b/include/i3status.h index 01d83d1..f24fec5 100644 --- a/include/i3status.h +++ b/include/i3status.h @@ -138,12 +138,12 @@ char *endcolor() __attribute__ ((pure)); char *auto_detect_format(); /* src/print_time.c */ -void set_timezone(const char *timezone); +void set_timezone(const char *tz); void print_ipv6_info(yajl_gen json_gen, char *buffer, const char *format_up, const char *format_down); void print_disk_info(yajl_gen json_gen, char *buffer, const char *path, const char *format); void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, int low_threshold, char *threshold_type, bool last_full_capacity); -void print_time(yajl_gen json_gen, char *buffer, const char *format, const char *timezone, time_t t); +void print_time(yajl_gen json_gen, char *buffer, const char *format, const char *tz, time_t t); void print_ddate(yajl_gen json_gen, char *buffer, const char *format, time_t t); const char *get_ip_addr(); void print_wireless_info(yajl_gen json_gen, char *buffer, const char *interface, const char *format_up, const char *format_down); |