resolve some header namespace non-issues

after re-reading 2.2.2 of POSIX 2008, all of these are in the correct
reserved namespaces and do not need protection.

diff --git a/arch/i386/bits/socket.h b/arch/i386/bits/socket.h
index b32306254fe016a4239a3e7af3575f2734218066..9d6722b901d495407777d09b22f7232aa745558b 100644 (file)
--- a/arch/i386/bits/socket.h
+++ b/arch/i386/bits/socket.h
@@ -201,7 +201,6 @@ struct linger
         ((struct cmsghdr *)__CMSG_NEXT(cmsg))))
 #define CMSG_FIRSTHDR(mhdr) ((size_t) (mhdr)->msg_controllen >= sizeof (struct cmsghdr) ? (struct cmsghdr *) (mhdr)->msg_control : (struct cmsghdr *) 0)
 
-/* Are these valid? */
 #define CMSG_ALIGN(len) (((len) + sizeof (size_t) - 1) & (size_t) ~(sizeof (size_t) - 1))
 #define CMSG_SPACE(len) (CMSG_ALIGN (len) + CMSG_ALIGN (sizeof (struct cmsghdr)))
 #define CMSG_LEN(len)   (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len))

diff --git a/include/netinet/in.h b/include/netinet/in.h
index a641f6a614109bc92b9adf2298620bee49f4f9ae..02a77ca5fb15b47d5ab7d8c05944c5590813c97c 100644 (file)
--- a/include/netinet/in.h
+++ b/include/netinet/in.h
@@ -134,7 +134,6 @@ uint16_t ntohs(uint16_t);
 
 #include <bits/in.h>
 
-#if 1 /* FIXME: namespace violation */
 #define        IN_CLASSA(a)            ((((in_addr_t)(a)) & 0x80000000) == 0)
 #define        IN_CLASSA_NET           0xff000000
 #define        IN_CLASSA_NSHIFT        24
@@ -153,6 +152,5 @@ uint16_t ntohs(uint16_t);
 #define        IN_MULTICAST(a)         IN_CLASSD(a)
 #define        IN_EXPERIMENTAL(a)      ((((in_addr_t)(a)) & 0xe0000000) == 0xe0000000)
 #define        IN_BADCLASS(a)          ((((in_addr_t)(a)) & 0xf0000000) == 0xf0000000)
-#endif
 
 #endif