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/sys/select.h |  6 +++---
 include/sys/socket.h | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'include/sys')

diff --git a/include/sys/select.h b/include/sys/select.h
index 9e17b19..c8fbb31 100644
--- a/include/sys/select.h
+++ b/include/sys/select.h
@@ -34,7 +34,7 @@ extern "C" {
 
 _STI void __fortify_FD_CLR(int __f, fd_set * _FORTIFY_POS0 __s)
 {
-	__fh_size_t __b = __bos(__s, 0);
+	__fh_size_t __b = __fh_bos(__s, 0);
 
 	if (__f < 0 || __f >= FD_SETSIZE || __b < sizeof(fd_set))
 		__builtin_trap();
@@ -43,7 +43,7 @@ _STI void __fortify_FD_CLR(int __f, fd_set * _FORTIFY_POS0 __s)
 
 _STI void __fortify_FD_SET(int __f, fd_set * _FORTIFY_POS0 __s)
 {
-	__fh_size_t __b = __bos(__s, 0);
+	__fh_size_t __b = __fh_bos(__s, 0);
 
 	if (__f < 0 || __f >= FD_SETSIZE || __b < sizeof(fd_set))
 		__builtin_trap();
@@ -52,7 +52,7 @@ _STI void __fortify_FD_SET(int __f, fd_set * _FORTIFY_POS0 __s)
 
 _STI int __fortify_FD_ISSET(int __f, fd_set * _FORTIFY_POS0 __s)
 {
-	__fh_size_t __b = __bos(__s, 0);
+	__fh_size_t __b = __fh_bos(__s, 0);
 
 	if (__f < 0 || __f >= FD_SETSIZE || __b < sizeof(fd_set))
 		__builtin_trap();
diff --git a/include/sys/socket.h b/include/sys/socket.h
index b7a8cf8..18648f9 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -34,46 +34,46 @@ extern "C" {
 #undef send
 #undef sendto
 
-__access(write_only, 2, 3)
+__fh_access(write_only, 2, 3)
 _FORTIFY_FN(recv) ssize_t recv(int __f, void * _FORTIFY_POS0 __s, size_t __n,
                                int __fl)
 {
-	__fh_size_t __b = __bos(__s, 0);
+	__fh_size_t __b = __fh_bos(__s, 0);
 
 	if (__n > __b)
 		__builtin_trap();
 	return __orig_recv(__f, __s, __n, __fl);
 }
 
-__access(write_only, 2, 3)
+__fh_access(write_only, 2, 3)
 _FORTIFY_FN(recvfrom) ssize_t recvfrom(int __f, void * _FORTIFY_POS0 __s,
                                        size_t __n, int __fl,
                                        struct sockaddr *__a, socklen_t *__l)
 {
-	__fh_size_t __b = __bos(__s, 0);
+	__fh_size_t __b = __fh_bos(__s, 0);
 
 	if (__n > __b)
 		__builtin_trap();
 	return __orig_recvfrom(__f, __s, __n, __fl, __a, __l);
 }
 
-__access(read_only, 2, 3)
+__fh_access(read_only, 2, 3)
 _FORTIFY_FN(send) ssize_t send(int __f, const void * _FORTIFY_POS0 __s,
                                size_t __n, int __fl)
 {
-	__fh_size_t __b = __bos(__s, 0);
+	__fh_size_t __b = __fh_bos(__s, 0);
 
 	if (__n > __b)
 		__builtin_trap();
 	return __orig_send(__f, __s, __n, __fl);
 }
 
-__access(read_only, 2, 3)
+__fh_access(read_only, 2, 3)
 _FORTIFY_FN(sendto) ssize_t sendto(int __f, const void * _FORTIFY_POS0 __s,
                                    size_t __n, int __fl,
                                    const struct sockaddr *__a, socklen_t __l)
 {
-	__fh_size_t __b = __bos(__s, 0);
+	__fh_size_t __b = __fh_bos(__s, 0);
 
 	if (__n > __b)
 		__builtin_trap();
-- 
cgit v1.3