[rtems-libbsd commit] sys/netinet/libalias: Fix symbols clashes

[Chris Johns]

Module:    rtems-libbsd
Branch:    6-freebsd-12
Commit:    5ef23a2836a3c56ea370affa9e81221dcf49b6e8
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=5ef23a2836a3c56ea370affa9e81221dcf49b6e8

Author:    Chris Johns <chrisj at rtems.org>
Date:      Mon Aug  2 18:15:35 2021 +1000

sys/netinet/libalias: Fix symbols clashes

Update #4475

---

 freebsd/sys/netinet/libalias/alias_cuseeme.c | 3 +++
 freebsd/sys/netinet/libalias/alias_dummy.c   | 4 +++-
 freebsd/sys/netinet/libalias/alias_ftp.c     | 3 +++
 freebsd/sys/netinet/libalias/alias_irc.c     | 3 +++
 freebsd/sys/netinet/libalias/alias_nbt.c     | 3 +++
 freebsd/sys/netinet/libalias/alias_pptp.c    | 3 +++
 freebsd/sys/netinet/libalias/alias_skinny.c  | 3 +++
 freebsd/sys/netinet/libalias/alias_smedia.c  | 3 +++
 8 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/freebsd/sys/netinet/libalias/alias_cuseeme.c b/freebsd/sys/netinet/libalias/alias_cuseeme.c
index 1d62a69..64a225f 100644
--- a/freebsd/sys/netinet/libalias/alias_cuseeme.c
+++ b/freebsd/sys/netinet/libalias/alias_cuseeme.c
@@ -95,6 +95,9 @@ protohandlerout(struct libalias *la, struct ip *pip, struct alias_data *ah)
 }
 
 /* Kernel module definition. */
+#ifdef __rtems__
+static
+#endif /* __rtems__ */
 struct proto_handler handlers[] = {
 	{
 	  .pri = 120,
diff --git a/freebsd/sys/netinet/libalias/alias_dummy.c b/freebsd/sys/netinet/libalias/alias_dummy.c
index 19f8430..608db93 100644
--- a/freebsd/sys/netinet/libalias/alias_dummy.c
+++ b/freebsd/sys/netinet/libalias/alias_dummy.c
@@ -105,6 +105,9 @@ protohandler(struct libalias *la, struct ip *pip, struct alias_data *ah)
  * ITS EXACT NAME: handlers.
  */
 
+#ifdef __rtems__
+static
+#endif /* __rtems__ */
 struct proto_handler handlers [] = {
 	{
 	  .pri = 666,
@@ -154,4 +157,3 @@ AliasHandleDummy(struct libalias *la, struct ip *ip, struct alias_data *ah)
 {
 	; /* Dummy. */
 }
-
diff --git a/freebsd/sys/netinet/libalias/alias_ftp.c b/freebsd/sys/netinet/libalias/alias_ftp.c
index 4a86139..e974181 100644
--- a/freebsd/sys/netinet/libalias/alias_ftp.c
+++ b/freebsd/sys/netinet/libalias/alias_ftp.c
@@ -151,6 +151,9 @@ protohandler_in(struct libalias *la, struct ip *pip, struct alias_data *ah)
 	return (0);
 }
 
+#ifdef __rtems__
+static
+#endif /* __rtems__ */
 struct proto_handler handlers[] = {
 	{
 	  .pri = 80,
diff --git a/freebsd/sys/netinet/libalias/alias_irc.c b/freebsd/sys/netinet/libalias/alias_irc.c
index 1933712..6b97aba 100644
--- a/freebsd/sys/netinet/libalias/alias_irc.c
+++ b/freebsd/sys/netinet/libalias/alias_irc.c
@@ -120,6 +120,9 @@ protohandler(struct libalias *la, struct ip *pip, struct alias_data *ah)
 	return (0);
 }
 
+#ifdef __rtems__
+static
+#endif /* __rtems__ */
 struct proto_handler handlers[] = {
 	{
 	  .pri = 90,
diff --git a/freebsd/sys/netinet/libalias/alias_nbt.c b/freebsd/sys/netinet/libalias/alias_nbt.c
index 3d200cd..73a6f41 100644
--- a/freebsd/sys/netinet/libalias/alias_nbt.c
+++ b/freebsd/sys/netinet/libalias/alias_nbt.c
@@ -131,6 +131,9 @@ protohandler2out(struct libalias *la, struct ip *pip, struct alias_data *ah)
 }
 
 /* Kernel module definition. */
+#ifdef __rtems__
+static
+#endif /* __rtems__ */
 struct proto_handler handlers[] = {
 	{
 	  .pri = 130,
diff --git a/freebsd/sys/netinet/libalias/alias_pptp.c b/freebsd/sys/netinet/libalias/alias_pptp.c
index e3da53b..14674ba 100644
--- a/freebsd/sys/netinet/libalias/alias_pptp.c
+++ b/freebsd/sys/netinet/libalias/alias_pptp.c
@@ -135,6 +135,9 @@ protohandlergreout(struct libalias *la, struct ip *pip, struct alias_data *ah)
 }
 
 /* Kernel module definition. */
+#ifdef __rtems__
+static
+#endif /* __rtems__ */
 struct proto_handler handlers[] = {
 	{
 	  .pri = 200,
diff --git a/freebsd/sys/netinet/libalias/alias_skinny.c b/freebsd/sys/netinet/libalias/alias_skinny.c
index 2cf235f..9ef8877 100644
--- a/freebsd/sys/netinet/libalias/alias_skinny.c
+++ b/freebsd/sys/netinet/libalias/alias_skinny.c
@@ -80,6 +80,9 @@ protohandler(struct libalias *la, struct ip *pip, struct alias_data *ah)
 	return (0);
 }
 
+#ifdef __rtems__
+static
+#endif /* __rtems__ */
 struct proto_handler handlers[] = {
 	{
 	  .pri = 110,
diff --git a/freebsd/sys/netinet/libalias/alias_smedia.c b/freebsd/sys/netinet/libalias/alias_smedia.c
index e279884..c9c1c67 100644
--- a/freebsd/sys/netinet/libalias/alias_smedia.c
+++ b/freebsd/sys/netinet/libalias/alias_smedia.c
@@ -164,6 +164,9 @@ protohandler(struct libalias *la, struct ip *pip, struct alias_data *ah)
 	return (0);
 }
 
+#ifdef __rtems__
+static
+#endif /* __rtems__ */
 struct proto_handler handlers[] = {
 	{
 	  .pri = 100,