drop htonl(), htons(), ntohl(), ntohs() MD functions from libc

Userland code compiled in a normal fashion picks up the htonl(),
htons(), ntohl(), ntohs() macros implemented by endian.h.  The
functions in libc are effectively unused.  Keep the MI functions
in case something looks for the symbols in libc or plays games
with #undef, but change them to wrap the implementation from
endian.h.

tweaks suggested by claudio@, ok miod@

1 files changed, 5 insertions, 10 deletions

diff --git a/src/lib/libc/net/Makefile.inc b/src/lib/libc/net/Makefile.inc
index 41a3164d6a..db2c75dad6 100644
--- a/src/lib/libc/net/Makefile.inc
+++ b/src/lib/libc/net/Makefile.inc
@@ -1,7 +1,7 @@
-#       $OpenBSD: Makefile.inc,v 1.60 2019/08/30 18:33:17 deraadt Exp $
+#       $OpenBSD: Makefile.inc,v 1.61 2024/04/15 14:30:48 naddy Exp $
 
 # net sources
-.PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/net ${LIBCSRCDIR}/net
+.PATH: ${LIBCSRCDIR}/net
 
 CFLAGS+=-DRESOLVSORT
 
@@ -10,10 +10,11 @@ SRCS+=	base64.c ethers.c freeaddrinfo.c \
         getifaddrs.c getnameinfo.c getnetent.c \
         getnetnamadr.c getpeereid.c getproto.c getprotoent.c getprotoname.c \
         getservbyname.c getservbyport.c getservent.c getrrsetbyname.c \
-        herror.c if_indextoname.c if_nameindex.c if_nametoindex.c inet_addr.c \
+        herror.c htonl.c htons.c \
+        if_indextoname.c if_nameindex.c if_nametoindex.c inet_addr.c \
         inet_lnaof.c inet_makeaddr.c inet_neta.c inet_netof.c inet_network.c \
         inet_net_ntop.c inet_net_pton.c inet_ntoa.c inet_ntop.c inet_pton.c \
-        linkaddr.c rcmd.c rcmdsh.c ruserok.c \
+        linkaddr.c ntohl.c ntohs.c rcmd.c rcmdsh.c ruserok.c \
         rresvport.c recv.c res_comp.c res_data.c \
         res_debug.c res_debug_syms.c res_init.c res_mkquery.c res_query.c \
         res_random.c res_send.c \
@@ -22,12 +23,6 @@ SRCS+=	base64.c ethers.c freeaddrinfo.c \
 # IPv6
 SRCS+=  ip6opt.c rthdr.c vars6.c
 
-# machine-dependent net sources
-# m-d Makefile.inc must include sources for:
-#       htonl() htons() ntohl() ntohs()
-
-.include "${LIBCSRCDIR}/arch/${MACHINE_CPU}/net/Makefile.inc"
-
 MAN+=   htobe64.3 ether_aton.3 gai_strerror.3 getaddrinfo.3 gethostbyname.3 \
         getifaddrs.3 getnameinfo.3 getnetent.3 getpeereid.3 getprotoent.3 \
         getrrsetbyname.3 getservent.3 htonl.3 if_indextoname.3 \