From a018052d410126f94c2602b208b099839d333b05 Mon Sep 17 00:00:00 2001
From: q66
Date: Fri, 15 Dec 2023 23:48:58 +0100
Subject: Rename some macros to be more namespace-friendly

---
 include/unistd.h | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'include/unistd.h')

diff --git a/include/unistd.h b/include/unistd.h
index 5074d33..69095d5 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -41,13 +41,13 @@ extern "C" {
 #undef ttyname_r
 #undef write
 
-__access(write_only, 2, 3)
+__fh_access(write_only, 2, 3)
 #if __has_builtin(__builtin_confstr)
 __diagnose_as_builtin(__builtin_confstr, 1, 2, 3)
 #endif
 _FORTIFY_FN(confstr) size_t confstr(int __n, char * _FORTIFY_POS0 __s, size_t __l)
 {
-	__fh_size_t __b = __bos(__s, 0);
+	__fh_size_t __b = __fh_bos(__s, 0);
 	__fh_size_t __r = __orig_confstr(__n, __s, __b > __l ? __l : __b);
 
 	if (__l > __b && __r > __b)
@@ -55,13 +55,13 @@ _FORTIFY_FN(confstr) size_t confstr(int __n, char * _FORTIFY_POS0 __s, size_t __
 	return __r;
 }
 
-__access(write_only, 1, 2)
+__fh_access(write_only, 1, 2)
 #if __has_builtin(__builtin_getcwd)
 __diagnose_as_builtin(__builtin_getcwd, 1, 2)
 #endif
 _FORTIFY_FN(getcwd) char *getcwd(char * _FORTIFY_POS0 __s, size_t __l)
 {
-	__fh_size_t __b = __bos(__s, 0);
+	__fh_size_t __b = __fh_bos(__s, 0);
 
 	if (__l > __b)
 		__builtin_trap();
@@ -70,13 +70,13 @@ _FORTIFY_FN(getcwd) char *getcwd(char * _FORTIFY_POS0 __s, size_t __l)
 
 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 #undef getdomainname
-__access(write_only, 1, 2)
+__fh_access(write_only, 1, 2)
 #if __has_builtin(__builtin_getdomainname)
 __diagnose_as_builtin(__builtin_getdomainname, 1, 2)
 #endif
 _FORTIFY_FN(getdomainname) int getdomainname(char * _FORTIFY_POS0 __s, size_t __l)
 {
-	__fh_size_t __b = __bos(__s, 0);
+	__fh_size_t __b = __fh_bos(__s, 0);
 
 	if (__l > __b)
 		__builtin_trap();
@@ -89,33 +89,33 @@ __diagnose_as_builtin(__builtin_getgroups, 1, 2)
 #endif
 _FORTIFY_FN(getgroups) int getgroups(int __l, gid_t * _FORTIFY_POS0 __s)
 {
-	__fh_size_t __b = __bos(__s, 0);
+	__fh_size_t __b = __fh_bos(__s, 0);
 
 	if (__l > 0 && (unsigned)__l > __b / sizeof(gid_t))
 		__builtin_trap();
 	return __orig_getgroups(__l, __s);
 }
 
-__access(write_only, 1, 2)
+__fh_access(write_only, 1, 2)
 #if __has_builtin(__builtin_gethostname)
 __diagnose_as_builtin(__builtin_gethostname, 1, 2)
 #endif
 _FORTIFY_FN(gethostname) int gethostname(char * _FORTIFY_POS0 __s, size_t __l)
 {
-	__fh_size_t __b = __bos(__s, 0);
+	__fh_size_t __b = __fh_bos(__s, 0);
 
 	if (__l > __b)
 		__builtin_trap();
 	return __orig_gethostname(__s, __l);
 }
 
-__access(write_only, 1, 2)
+__fh_access(write_only, 1, 2)
 #if __has_builtin(__builtin_getlogin_r)
 __diagnose_as_builtin(__builtin_getlogin_r, 1, 2)
 #endif
 _FORTIFY_FN(getlogin_r) int getlogin_r(char * _FORTIFY_POS0 __s, size_t __l)
 {
-	__fh_size_t __b = __bos(__s, 0);
+	__fh_size_t __b = __fh_bos(__s, 0);
 
 	if (__l > __b)
 		__builtin_trap();
@@ -128,76 +128,76 @@ __diagnose_as_builtin(__builtin_pread, 1, 2, 3, 4)
 _FORTIFY_FN(pread) ssize_t pread(int __f, void * _FORTIFY_POS0 __s,
                                  size_t __n, off_t __o)
 {
-	__fh_size_t __b = __bos(__s, 0);
+	__fh_size_t __b = __fh_bos(__s, 0);
 
 	if (__n > __b)
 		__builtin_trap();
 	return __orig_pread(__f, __s, __n, __o);
 }
 
-__access(write_only, 2, 3)
+__fh_access(write_only, 2, 3)
 #if __has_builtin(__builtin_read)
 __diagnose_as_builtin(__builtin_read, 1, 2, 3)
 #endif
 _FORTIFY_FN(read) ssize_t read(int __f, void * _FORTIFY_POS0 __s, size_t __n)
 {
-	__fh_size_t __b = __bos(__s, 0);
+	__fh_size_t __b = __fh_bos(__s, 0);
 
 	if (__n > __b)
 		__builtin_trap();
 	return __orig_read(__f, __s, __n);
 }
 
-__access(write_only, 2, 3)
+__fh_access(write_only, 2, 3)
 #if __has_builtin(__builtin_readlink)
 __diagnose_as_builtin(__builtin_readlink, 1, 2, 3)
 #endif
 _FORTIFY_FN(readlink) ssize_t readlink(const char *__p,
                                        char * _FORTIFY_POS0 __s, size_t __n)
 {
-	__fh_size_t __b = __bos(__s, 0);
+	__fh_size_t __b = __fh_bos(__s, 0);
 
 	if (__n > __b)
 		__builtin_trap();
 	return __orig_readlink(__p, __s, __n);
 }
 
-__access(write_only, 3, 4)
+__fh_access(write_only, 3, 4)
 #if __has_builtin(__builtin_readlinkat)
 __diagnose_as_builtin(__builtin_readlinkat, 1, 2, 3, 4)
 #endif
 _FORTIFY_FN(readlinkat) ssize_t readlinkat(int __f, const char *__p,
                                            char * _FORTIFY_POS0 __s, size_t __n)
 {
-	__fh_size_t __b = __bos(__s, 0);
+	__fh_size_t __b = __fh_bos(__s, 0);
 
 	if (__n > __b)
 		__builtin_trap();
 	return __orig_readlinkat(__f, __p, __s, __n);
 }
 
-__access(write_only, 2, 3)
+__fh_access(write_only, 2, 3)
 #if __has_builtin(__builtin_ttyname_r)
 __diagnose_as_builtin(__builtin_ttyname_r, 1, 2, 3)
 #endif
 _FORTIFY_FN(ttyname_r) int ttyname_r(int __f, char * _FORTIFY_POS0 __s,
                                      size_t __n)
 {
-	__fh_size_t __b = __bos(__s, 0);
+	__fh_size_t __b = __fh_bos(__s, 0);
 
 	if (__n > __b)
 		__builtin_trap();
 	return __orig_ttyname_r(__f, __s, __n);
 }
 
-__access(read_only, 2, 3)
+__fh_access(read_only, 2, 3)
 #if __has_builtin(__builtin_write)
 __diagnose_as_builtin(__builtin_write, 1, 2, 3)
 #endif
 _FORTIFY_FN(write) ssize_t write(int __f, const void * _FORTIFY_POS0 __s,
                                  size_t __n)
 {
-	__fh_size_t __b = __bos(__s, 0);
+	__fh_size_t __b = __fh_bos(__s, 0);
 
 	if (__n > __b)
 		__builtin_trap();
@@ -210,7 +210,7 @@ __diagnose_as_builtin(__builtin_pwrite, 1, 2, 3, 4)
 _FORTIFY_FN(pwrite) ssize_t pwrite(int __f, const void * _FORTIFY_POS0 __s,
                                  size_t __n, off_t __o)
 {
-	__fh_size_t __b = __bos(__s, 0);
+	__fh_size_t __b = __fh_bos(__s, 0);
 
 	if (__n > __b)
 		__builtin_trap();
-- 
cgit v1.3