[libbsd 02/22] Fix redefinition warnings

Sebastian Huber sebastian.huber at embedded-brains.de
Fri Jun 24 06:33:30 UTC 2022


---
 freebsd/sys/netinet/in_pcb.h                          | 4 ++++
 rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/freebsd/sys/netinet/in_pcb.h b/freebsd/sys/netinet/in_pcb.h
index ecbd7a22..848a9af0 100644
--- a/freebsd/sys/netinet/in_pcb.h
+++ b/freebsd/sys/netinet/in_pcb.h
@@ -609,6 +609,10 @@ void inp_rlock(struct inpcb *);
 void inp_runlock(struct inpcb *);
 
 #ifdef INVARIANT_SUPPORT
+#ifdef __rtems__
+#define	inp_lock_assert _bsd_inp_lock_assert
+#define	inp_unlock_assert _bsd_inp_unlock_assert
+#endif /* __rtems__ */
 void inp_lock_assert(struct inpcb *);
 void inp_unlock_assert(struct inpcb *);
 #else
diff --git a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h
index 94e0d56f..599c7d82 100644
--- a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h
+++ b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h
@@ -2871,13 +2871,11 @@
 #define	inp_inpcbtotcpcb _bsd_inp_inpcbtotcpcb
 #define	inp_ip_tos_get _bsd_inp_ip_tos_get
 #define	inp_ip_tos_set _bsd_inp_ip_tos_set
-#define	inp_lock_assert _bsd_inp_lock_assert
 #define	inp_rlock _bsd_inp_rlock
 #define	inp_runlock _bsd_inp_runlock
 #define	inp_setmoptions _bsd_inp_setmoptions
 #define	inp_so_options _bsd_inp_so_options
 #define	inp_to_cpuid _bsd_inp_to_cpuid
-#define	inp_unlock_assert _bsd_inp_unlock_assert
 #define	inp_wlock _bsd_inp_wlock
 #define	inp_wunlock _bsd_inp_wunlock
 #define	insmntque _bsd_insmntque
-- 
2.35.3



More information about the devel mailing list