diff options
| author | SoniEx2 <endermoneymod@gmail.com> | 2021-05-27 20:39:07 -0300 |
|---|---|---|
| committer | SoniEx2 <endermoneymod@gmail.com> | 2021-05-27 20:39:07 -0300 |
| commit | 5571d277b93b62c73568b78c652c85b2e8e95183 (patch) | |
| tree | 0d97d65058e31ccdeab4006384442a8e378d5f06 /plugins/sysinfo | |
| parent | f58165fd33919951e2ca594c6f19a785420fc4f9 (diff) | |
| parent | 7f8b0a19cff46f7d27451fb9942eea5018f0c5b5 (diff) | |
Merge upstream changes
Diffstat (limited to 'plugins/sysinfo')
| -rw-r--r-- | plugins/sysinfo/meson.build | 4 | ||||
| -rw-r--r-- | plugins/sysinfo/shared/df.c | 2 | ||||
| -rw-r--r-- | plugins/sysinfo/sysinfo.vcxproj | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/plugins/sysinfo/meson.build b/plugins/sysinfo/meson.build index 8b67da2e..7e2cdb6c 100644 --- a/plugins/sysinfo/meson.build +++ b/plugins/sysinfo/meson.build @@ -13,13 +13,13 @@ sysinfo_includes = [] sysinfo_cargs = [] system = host_machine.system() -if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'darwin' +if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'darwin' or system == 'freebsd' sysinfo_includes += 'shared' sysinfo_sources += [ 'shared/df.c' ] - if system == 'linux' or system == 'gnu' or system.startswith('gnu/') + if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'freebsd' libpci = dependency('libpci', required: false, method: 'pkg-config') if libpci.found() sysinfo_deps += libpci diff --git a/plugins/sysinfo/shared/df.c b/plugins/sysinfo/shared/df.c index ce0760a6..bb2c2131 100644 --- a/plugins/sysinfo/shared/df.c +++ b/plugins/sysinfo/shared/df.c @@ -26,7 +26,7 @@ int xs_parse_df(gint64 *out_total, gint64 *out_free) FILE *pipe; char buffer[bsize]; - pipe = popen("df -k -l -P", "r"); + pipe = popen("df -k -l -P --exclude-type=squashfs --exclude-type=devtmpfs --exclude-type=tmpfs", "r"); if(pipe==NULL) return 1; diff --git a/plugins/sysinfo/sysinfo.vcxproj b/plugins/sysinfo/sysinfo.vcxproj index b1c7c8f0..a3ff0f8a 100644 --- a/plugins/sysinfo/sysinfo.vcxproj +++ b/plugins/sysinfo/sysinfo.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Label="Configuration"> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v142</PlatformToolset> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> |