From 593925ceb46583c75a4b541598937aad30d4a3d3 Mon Sep 17 00:00:00 2001 From: jD91mZM2 <me@krake.one> Date: Mon, 29 Jun 2020 11:34:51 +0200 Subject: [PATCH] Unambiguate all include guards GNU binutils also uses _FNMATCH_H for a guard, maybe along others! --- src/header/_aio/cbindgen.toml | 2 +- src/header/_fenv/cbindgen.toml | 2 +- src/header/_template/cbindgen.toml | 2 +- src/header/_wctype/cbindgen.toml | 2 +- src/header/assert/cbindgen.toml | 2 +- src/header/ctype/cbindgen.toml | 2 +- src/header/dirent/cbindgen.toml | 2 +- src/header/dlfcn/cbindgen.toml | 2 +- src/header/errno/cbindgen.toml | 2 +- src/header/fcntl/cbindgen.toml | 2 +- src/header/float/cbindgen.toml | 2 +- src/header/fnmatch/cbindgen.toml | 2 +- src/header/getopt/cbindgen.toml | 2 +- src/header/grp/cbindgen.toml | 2 +- src/header/inttypes/cbindgen.toml | 2 +- src/header/libgen/cbindgen.toml | 2 +- src/header/limits/cbindgen.toml | 2 +- src/header/locale/cbindgen.toml | 2 +- src/header/netdb/cbindgen.toml | 2 +- src/header/poll/cbindgen.toml | 2 +- src/header/pwd/cbindgen.toml | 2 +- src/header/regex/cbindgen.toml | 2 +- src/header/semaphore/cbindgen.toml | 2 +- src/header/sgtty/cbindgen.toml | 2 +- src/header/signal/cbindgen.toml | 2 +- src/header/stdio/cbindgen.toml | 2 +- src/header/stdlib/cbindgen.toml | 2 +- src/header/string/cbindgen.toml | 2 +- src/header/strings/cbindgen.toml | 2 +- src/header/termios/cbindgen.toml | 2 +- src/header/time/cbindgen.toml | 2 +- src/header/unistd/cbindgen.toml | 2 +- src/header/utime/cbindgen.toml | 2 +- src/header/wchar/cbindgen.toml | 2 +- src/header/wctype/cbindgen.toml | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/header/_aio/cbindgen.toml b/src/header/_aio/cbindgen.toml index f7e9c708..fd387cb5 100644 --- a/src/header/_aio/cbindgen.toml +++ b/src/header/_aio/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = [] -include_guard = "_AIO_H" +include_guard = "_RELIBC_AIO_H" language = "C" style = "Tag" no_includes = true diff --git a/src/header/_fenv/cbindgen.toml b/src/header/_fenv/cbindgen.toml index dc3df6a7..e8ca9b12 100644 --- a/src/header/_fenv/cbindgen.toml +++ b/src/header/_fenv/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["stdint.h", "sys/types.h"] -include_guard = "_FENV_H" +include_guard = "_RELIBC_FENV_H" language = "C" style = "Tag" no_includes = true diff --git a/src/header/_template/cbindgen.toml b/src/header/_template/cbindgen.toml index 6eb75339..fbdebd78 100644 --- a/src/header/_template/cbindgen.toml +++ b/src/header/_template/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = [] -include_guard = "_TEMPLATE_H" +include_guard = "_RELIBC_TEMPLATE_H" language = "C" style = "Tag" no_includes = true diff --git a/src/header/_wctype/cbindgen.toml b/src/header/_wctype/cbindgen.toml index 57aab6a4..9477e2aa 100644 --- a/src/header/_wctype/cbindgen.toml +++ b/src/header/_wctype/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = [] -include_guard = "_WCTYPE_H" +include_guard = "_RELIBC_WCTYPE_H" language = "C" style = "Tag" no_includes = true diff --git a/src/header/assert/cbindgen.toml b/src/header/assert/cbindgen.toml index eec2bfb1..7d1598f4 100644 --- a/src/header/assert/cbindgen.toml +++ b/src/header/assert/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["bits/assert.h"] -include_guard = "_ASSERT_H" +include_guard = "_RELIBC_ASSERT_H" language = "C" style = "Tag" no_includes = true diff --git a/src/header/ctype/cbindgen.toml b/src/header/ctype/cbindgen.toml index ff4f1d59..f47026b4 100644 --- a/src/header/ctype/cbindgen.toml +++ b/src/header/ctype/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["bits/ctype.h"] -include_guard = "_CTYPE_H" +include_guard = "_RELIBC_CTYPE_H" language = "C" style = "Tag" no_includes = true diff --git a/src/header/dirent/cbindgen.toml b/src/header/dirent/cbindgen.toml index 252f91ff..5ba9d76a 100644 --- a/src/header/dirent/cbindgen.toml +++ b/src/header/dirent/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["sys/types.h"] -include_guard = "_DIRENT_H" +include_guard = "_RELIBC_DIRENT_H" language = "C" style = "Both" trailer = "#include <bits/dirent.h>" diff --git a/src/header/dlfcn/cbindgen.toml b/src/header/dlfcn/cbindgen.toml index 7e00f6ec..3a324bd8 100644 --- a/src/header/dlfcn/cbindgen.toml +++ b/src/header/dlfcn/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = [] -include_guard = "_DLFCN_H" +include_guard = "_RELIBC_DLFCN_H" language = "C" style = "Type" no_includes = true diff --git a/src/header/errno/cbindgen.toml b/src/header/errno/cbindgen.toml index 97769954..7de26bfd 100644 --- a/src/header/errno/cbindgen.toml +++ b/src/header/errno/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["bits/errno.h"] -include_guard = "_ERRNO_H" +include_guard = "_RELIBC_ERRNO_H" language = "C" style = "Tag" no_includes = true diff --git a/src/header/fcntl/cbindgen.toml b/src/header/fcntl/cbindgen.toml index 28019aee..40377c71 100644 --- a/src/header/fcntl/cbindgen.toml +++ b/src/header/fcntl/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["stdarg.h", "sys/types.h"] -include_guard = "_FCNTL_H" +include_guard = "_RELIBC_FCNTL_H" trailer = "#include <bits/fcntl.h>" language = "C" style = "Tag" diff --git a/src/header/float/cbindgen.toml b/src/header/float/cbindgen.toml index 976cd7b8..4ca9cc2e 100644 --- a/src/header/float/cbindgen.toml +++ b/src/header/float/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["sys/types.h", "bits/float.h"] -include_guard = "_FLOAT_H" +include_guard = "_RELIBC_FLOAT_H" language = "C" style = "Tag" no_includes = true diff --git a/src/header/fnmatch/cbindgen.toml b/src/header/fnmatch/cbindgen.toml index 1acf898c..c5cb5bab 100644 --- a/src/header/fnmatch/cbindgen.toml +++ b/src/header/fnmatch/cbindgen.toml @@ -1,4 +1,4 @@ -include_guard = "_FNMATCH_H" +include_guard = "_RELIBC_FNMATCH_H" language = "C" style = "Tag" no_includes = true diff --git a/src/header/getopt/cbindgen.toml b/src/header/getopt/cbindgen.toml index 3d74bd50..36e26009 100644 --- a/src/header/getopt/cbindgen.toml +++ b/src/header/getopt/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["unistd.h"] -include_guard = "_GETOPT_H" +include_guard = "_RELIBC_GETOPT_H" language = "C" style = "Tag" no_includes = true diff --git a/src/header/grp/cbindgen.toml b/src/header/grp/cbindgen.toml index 8db7bd7d..4a2e9f2c 100644 --- a/src/header/grp/cbindgen.toml +++ b/src/header/grp/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = [] -include_guard = "_GRP_H" +include_guard = "_RELIBC_GRP_H" language = "C" style = "Tag" no_includes = true diff --git a/src/header/inttypes/cbindgen.toml b/src/header/inttypes/cbindgen.toml index 81e45805..f923cb68 100644 --- a/src/header/inttypes/cbindgen.toml +++ b/src/header/inttypes/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["stdint.h", "wchar.h"] -include_guard = "_INTTYPES_H" +include_guard = "_RELIBC_INTTYPES_H" trailer = "#include <bits/inttypes.h>" language = "C" style = "Type" diff --git a/src/header/libgen/cbindgen.toml b/src/header/libgen/cbindgen.toml index b407f8cc..50d05035 100644 --- a/src/header/libgen/cbindgen.toml +++ b/src/header/libgen/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = [] -include_guard = "_LIBGEN_H" +include_guard = "_RELIBC_LIBGEN_H" language = "C" style = "Tag" no_includes = true diff --git a/src/header/limits/cbindgen.toml b/src/header/limits/cbindgen.toml index a35e1404..df8b0b04 100644 --- a/src/header/limits/cbindgen.toml +++ b/src/header/limits/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = [] -include_guard = "_LIMITS_H" +include_guard = "_RELIBC_LIMITS_H" trailer = "#include <bits/limits.h>" language = "C" style = "Tag" diff --git a/src/header/locale/cbindgen.toml b/src/header/locale/cbindgen.toml index 2a7072bb..edb2300b 100644 --- a/src/header/locale/cbindgen.toml +++ b/src/header/locale/cbindgen.toml @@ -1,4 +1,4 @@ -include_guard = "_LOCALE_H" +include_guard = "_RELIBC_LOCALE_H" trailer = "#include <bits/locale.h>" language = "C" style = "Tag" diff --git a/src/header/netdb/cbindgen.toml b/src/header/netdb/cbindgen.toml index fdbf6fa8..b4332479 100644 --- a/src/header/netdb/cbindgen.toml +++ b/src/header/netdb/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["sys/socket.h", "netinet/in.h"] -include_guard = "_NETDB_H" +include_guard = "_RELIBC_NETDB_H" trailer = "#include <bits/netdb.h>" language = "C" style = "Tag" diff --git a/src/header/poll/cbindgen.toml b/src/header/poll/cbindgen.toml index db04f56c..ac981e6a 100644 --- a/src/header/poll/cbindgen.toml +++ b/src/header/poll/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = [] -include_guard = "_POLL_H" +include_guard = "_RELIBC_POLL_H" language = "C" style = "Tag" no_includes = true diff --git a/src/header/pwd/cbindgen.toml b/src/header/pwd/cbindgen.toml index bce631e4..55d0cdf9 100644 --- a/src/header/pwd/cbindgen.toml +++ b/src/header/pwd/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["stddef.h", "sys/types.h"] -include_guard = "_PWD_H" +include_guard = "_RELIBC_PWD_H" language = "C" style = "Tag" no_includes = true diff --git a/src/header/regex/cbindgen.toml b/src/header/regex/cbindgen.toml index 550385cd..78dfc8ee 100644 --- a/src/header/regex/cbindgen.toml +++ b/src/header/regex/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["sys/types.h"] -include_guard = "_REGEX_H" +include_guard = "_RELIBC_REGEX_H" language = "C" style = "Type" no_includes = true diff --git a/src/header/semaphore/cbindgen.toml b/src/header/semaphore/cbindgen.toml index 8514bfba..0c011949 100644 --- a/src/header/semaphore/cbindgen.toml +++ b/src/header/semaphore/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = [] -include_guard = "_SEMAPHORE_H" +include_guard = "_RELIBC_SEMAPHORE_H" language = "C" style = "Tag" no_includes = true diff --git a/src/header/sgtty/cbindgen.toml b/src/header/sgtty/cbindgen.toml index f6f653d6..f566f920 100644 --- a/src/header/sgtty/cbindgen.toml +++ b/src/header/sgtty/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["sys/ioctl.h"] -include_guard = "_SGTTY_H" +include_guard = "_RELIBC_SGTTY_H" language = "C" style = "Tag" no_includes = true diff --git a/src/header/signal/cbindgen.toml b/src/header/signal/cbindgen.toml index 73a7c9e4..46bbe113 100644 --- a/src/header/signal/cbindgen.toml +++ b/src/header/signal/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["stdint.h", "sys/types.h"] -include_guard = "_SIGNAL_H" +include_guard = "_RELIBC_SIGNAL_H" trailer = "#include <bits/signal.h>" language = "C" style = "Tag" diff --git a/src/header/stdio/cbindgen.toml b/src/header/stdio/cbindgen.toml index 1be8edc8..633b4498 100644 --- a/src/header/stdio/cbindgen.toml +++ b/src/header/stdio/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["stdarg.h", "stddef.h", "stdint.h", "sys/types.h"] -include_guard = "_STDIO_H" +include_guard = "_RELIBC_STDIO_H" trailer = "#include <bits/stdio.h>" language = "C" style = "Type" diff --git a/src/header/stdlib/cbindgen.toml b/src/header/stdlib/cbindgen.toml index 1f21fbb5..7e9b9a86 100644 --- a/src/header/stdlib/cbindgen.toml +++ b/src/header/stdlib/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["stddef.h", "alloca.h"] -include_guard = "_STDLIB_H" +include_guard = "_RELIBC_STDLIB_H" trailer = "#include <bits/stdlib.h>" language = "C" style = "Type" diff --git a/src/header/string/cbindgen.toml b/src/header/string/cbindgen.toml index bea34fa1..9cee2c5d 100644 --- a/src/header/string/cbindgen.toml +++ b/src/header/string/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["stddef.h", "stdint.h", "strings.h"] -include_guard = "_STRING_H" +include_guard = "_RELIBC_STRING_H" language = "C" style = "Tag" no_includes = true diff --git a/src/header/strings/cbindgen.toml b/src/header/strings/cbindgen.toml index 20fc84e0..2897bd54 100644 --- a/src/header/strings/cbindgen.toml +++ b/src/header/strings/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["stddef.h", "stdint.h"] -include_guard = "_STRINGS_H" +include_guard = "_RELIBC_STRINGS_H" language = "C" style = "Tag" no_includes = true diff --git a/src/header/termios/cbindgen.toml b/src/header/termios/cbindgen.toml index eafb3c12..03a82a15 100644 --- a/src/header/termios/cbindgen.toml +++ b/src/header/termios/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["stdint.h"] -include_guard = "_TERMIOS_H" +include_guard = "_RELIBC_TERMIOS_H" language = "C" style = "Tag" no_includes = true diff --git a/src/header/time/cbindgen.toml b/src/header/time/cbindgen.toml index 61af8ce8..0b7e7399 100644 --- a/src/header/time/cbindgen.toml +++ b/src/header/time/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["sys/types.h", "stdint.h", "stddef.h"] -include_guard = "_TIME_H" +include_guard = "_RELIBC_TIME_H" language = "C" style = "Tag" no_includes = true diff --git a/src/header/unistd/cbindgen.toml b/src/header/unistd/cbindgen.toml index f8450e0c..610d6d21 100644 --- a/src/header/unistd/cbindgen.toml +++ b/src/header/unistd/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["stddef.h", "stdint.h", "sys/types.h"] -include_guard = "_UNISTD_H" +include_guard = "_RELIBC_UNISTD_H" trailer = "#include <bits/fcntl.h>\n#include <bits/unistd.h>" language = "C" style = "Tag" diff --git a/src/header/utime/cbindgen.toml b/src/header/utime/cbindgen.toml index a415b33c..e4e12554 100644 --- a/src/header/utime/cbindgen.toml +++ b/src/header/utime/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = [] -include_guard = "_UTIME_H" +include_guard = "_RELIBC_UTIME_H" language = "C" style = "Tag" no_includes = true diff --git a/src/header/wchar/cbindgen.toml b/src/header/wchar/cbindgen.toml index 853cfd27..1a2836a9 100644 --- a/src/header/wchar/cbindgen.toml +++ b/src/header/wchar/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["stddef.h", "stdint.h", "time.h", "stdio.h" ] -include_guard = "_WCHAR_H" +include_guard = "_RELIBC_WCHAR_H" header = "#include <bits/wchar.h>" language = "C" style = "Type" diff --git a/src/header/wctype/cbindgen.toml b/src/header/wctype/cbindgen.toml index 872e70e9..032cfcb0 100644 --- a/src/header/wctype/cbindgen.toml +++ b/src/header/wctype/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["stddef.h", "stdint.h", "time.h", "stdio.h" ] -include_guard = "_WCTYPE_H" +include_guard = "_RELIBC_WCTYPE_H" header = "#include <bits/wctype.h>" language = "C" style = "Type" -- GitLab