diff options
| author | TingPing <tingping@tingping.se> | 2015-02-21 20:52:43 -0500 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2015-02-21 20:52:43 -0500 |
| commit | c36d4859d7e8d8907e4fe82e82d690d76df389ab (patch) | |
| tree | f4da9c26996b9b5ca8cc89848c14bac6827870c2 | |
| parent | c1d06c7d633ad0edc1ac8f63200f7f12a96d9f56 (diff) | |
Fix type mismatch
| -rw-r--r-- | plugins/sysinfo/unix/backend.c | 2 | ||||
| -rw-r--r-- | plugins/sysinfo/unix/parse.c | 4 | ||||
| -rw-r--r-- | plugins/sysinfo/unix/parse.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/plugins/sysinfo/unix/backend.c b/plugins/sysinfo/unix/backend.c index 76a6f70f..dc065518 100644 --- a/plugins/sysinfo/unix/backend.c +++ b/plugins/sysinfo/unix/backend.c @@ -147,7 +147,7 @@ char *sysinfo_backend_get_sound(void) char *sysinfo_backend_get_uptime(void) { - guint64 uptime; + gint64 uptime; if ((uptime = xs_parse_uptime ()) == 0) { diff --git a/plugins/sysinfo/unix/parse.c b/plugins/sysinfo/unix/parse.c index 9f03533d..0ca140de 100644 --- a/plugins/sysinfo/unix/parse.c +++ b/plugins/sysinfo/unix/parse.c @@ -107,10 +107,10 @@ int xs_parse_cpu(char *model, char *vendor, double *freq) return 0; } -guint64 xs_parse_uptime(void) +gint64 xs_parse_uptime(void) { char buffer[bsize]; - guint64 uptime = 0; + gint64 uptime = 0; FILE *fp = fopen("/proc/uptime", "r"); if(fp == NULL) return 0; diff --git a/plugins/sysinfo/unix/parse.h b/plugins/sysinfo/unix/parse.h index 89f1299c..c7cb571e 100644 --- a/plugins/sysinfo/unix/parse.h +++ b/plugins/sysinfo/unix/parse.h @@ -24,7 +24,7 @@ #define _PARSE_H_ int xs_parse_cpu(char *model, char *vendor, double *freq); -guint64 xs_parse_uptime(void); +gint64 xs_parse_uptime(void); int xs_parse_sound(char *snd_card); int xs_parse_meminfo(unsigned long long *mem_tot, unsigned long long *mem_free, int swap); int xs_parse_video(char *vid_card); |