diff options
| author | Patrick Griffis <tingping@tingping.se> | 2018-03-05 19:25:08 -0500 |
|---|---|---|
| committer | Patrick Griffis <tingping@tingping.se> | 2018-03-09 18:23:25 +0000 |
| commit | e9b9ff9f38abc82c0a5002d5e58a5c226b698f82 (patch) | |
| tree | a9fa9c40111985faae17348ce47293a048dd6bbb /plugins | |
| parent | 9b8a7eaa0147c6a564c1d1401d57cc685461e320 (diff) | |
Various fixes for mingw
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/sysinfo/meson.build | 8 | ||||
| -rw-r--r-- | plugins/sysinfo/win32/backend.c | 14 |
2 files changed, 7 insertions, 15 deletions
diff --git a/plugins/sysinfo/meson.build b/plugins/sysinfo/meson.build index 3781bd52..aac52e89 100644 --- a/plugins/sysinfo/meson.build +++ b/plugins/sysinfo/meson.build @@ -5,7 +5,8 @@ sysinfo_sources = [ sysinfo_deps = [ libgio_dep, - hexchat_plugin_dep + hexchat_plugin_dep, + common_sysinfo_deps, ] sysinfo_includes = [] @@ -41,7 +42,10 @@ if system == 'linux' or system == 'darwin' endif elif system == 'windows' - sysinfo_sources += 'win32/backend.c' + sysinfo_sources += [ + 'win32/backend.c', + '../../src/common/sysinfo/win32/backend.c' + ] else error('sysinfo: Unknown system?') endif diff --git a/plugins/sysinfo/win32/backend.c b/plugins/sysinfo/win32/backend.c index 446bc252..9bf949c5 100644 --- a/plugins/sysinfo/win32/backend.c +++ b/plugins/sysinfo/win32/backend.c @@ -30,14 +30,7 @@ #include "../format.h" -static int command_callback (char *word[], char *word_eol[], void *user_data); - -void print_info (void); - -guint64 hdd_capacity; -guint64 hdd_free_space; -char *read_hdd_info (IWbemClassObject *object); -char *get_memory_info (void); +static char *get_memory_info (void); char * sysinfo_backend_get_sound (void) @@ -98,11 +91,6 @@ sysinfo_backend_get_os (void) return sysinfo_get_os (); } -static int get_cpu_arch (void) -{ - return sysinfo_get_cpu_arch (); -} - static char *get_memory_info (void) { MEMORYSTATUSEX meminfo = { 0 }; |