Merge branch 'sys-stat-statvfs' into 'master'

disambiguate include guards for sys_stat and sys_statvfs

See merge request redox-os/relibc!1239

src/header/sys_stat/cbindgen.toml

@@ -5,9 +5,9 @@
 # - "The <sys/stat.h> header shall define the timespec structure as described in <time.h>. Times shall be given in seconds since the Epoch."
 # - "Inclusion of the <sys/stat.h> header may make visible all symbols from the <time.h> header."
 sys_includes = ["sys/types.h"]
-include_guard = "_SYS_STAT_H"
+include_guard = "_RELIBC_SYS_STAT_H"
 after_includes = """
-#include <bits/timespec.h> // for timespec
+#include <bits/timespec.h> // for timespec from time.h
 
 #define S_ISDIR(mode)  (((mode) & S_IFMT) == S_IFDIR)
 #define S_ISCHR(mode)  (((mode) & S_IFMT) == S_IFCHR)

src/header/sys_statvfs/cbindgen.toml

@@ -3,7 +3,7 @@
 # Spec quotations relating to includes:
 # - "The <sys/statvfs.h> header shall define the fsblkcnt_t and fsfilcnt_t types as described in <sys/types.h>."
 sys_includes = ["sys/types.h"]
-include_guard = "_SYS_STATVFS_H"
+include_guard = "_RELIBC_SYS_STATVFS_H"
 language = "C"
 style = "Tag"
 no_includes = true