1999-05-16 Roland McGrath <roland@baalperazim.frob.com>

* sysdeps/unix/sysv/linux/sys/socketvar.h: Moved to ... 
* sysdeps/generic/sys/socketvar.h: ... here. 
* sysdeps/unix/sysv/linux/netinet/in_systm.h: Moved to ... 
* sysdeps/generic/netinet/in_systm.h: ... here. 
* sysdeps/unix/sysv/linux/Dist: Remove netinet/in_systm.h, 
sys/socketvar.h. 
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Likewise. 
* inet/Makefile (headers): Add netinet/in_systm.h here. 
* socket/Makefile (headers): Add sys/socketvar.h here.

7 files changed, 9 insertions, 10 deletions

diff --git a/inet/Makefile b/inet/Makefile
index d37cfc7e71..12da863f80 100644
--- a/inet/Makefile
+++ b/inet/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+# Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -21,7 +21,8 @@
 #
 subdir	:= inet
 
-headers	:= netinet/ether.h netinet/in.h netinet/if_ether.h \
+headers	:= netinet/ether.h netinet/in.h netinet/in_systm.h \
+	   netinet/if_ether.h \
 	   netinet/tcp.h netinet/ip.h $(wildcard arpa/*.h protocols/*.h) \
 	   aliases.h netinet/ip6.h netinet/icmp6.h bits/in.h
 
diff --git a/socket/Makefile b/socket/Makefile
index 4f8f85fff2..430b7585af 100644
--- a/socket/Makefile
+++ b/socket/Makefile
@@ -21,7 +21,8 @@
 #
 subdir	:= socket
 
-headers	:= sys/socket.h sys/un.h bits/sockaddr.h bits/socket.h
+headers	:= sys/socket.h sys/un.h bits/sockaddr.h bits/socket.h \
+	   sys/socketvar.h
 
 routines := accept bind connect getpeername getsockname getsockopt	\
 	    listen recv recvfrom recvmsg send sendmsg sendto		\
diff --git a/sysdeps/unix/sysv/linux/netinet/in_systm.h b/sysdeps/generic/netinet/in_systm.h
index 902fe6ea0e..902fe6ea0e 100644
--- a/sysdeps/unix/sysv/linux/netinet/in_systm.h
+++ b/sysdeps/generic/netinet/in_systm.h
diff --git a/sysdeps/generic/sys/socketvar.h b/sysdeps/generic/sys/socketvar.h
new file mode 100644
index 0000000000..b177158d0b
--- /dev/null
+++ b/sysdeps/generic/sys/socketvar.h
@@ -0,0 +1,3 @@
+/* This header is used on many systems but for GNU we have everything
+   already defined in the standard header.  */
+#include <sys/socket.h>
diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index fca513d1b7..452b4f02a5 100644
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -36,7 +36,6 @@ neteconet/ec.h
 netinet/if_fddi.h
 netinet/if_tr.h
 netinet/igmp.h
-netinet/in_systm.h
 netpacket/packet.h
 netipx/ipx.h
 netrom/netrom.h
@@ -64,7 +63,6 @@ sys/prctl.h
 sys/procfs.h
 sys/quota.h
 sys/sendfile.h
-sys/socketvar.h
 sys/soundcard.h
 sys/sysctl.h
 sys/sysinfo.h
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 69c08ea902..04ddf916be 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -86,8 +86,7 @@ sysdep_headers += bits/pthreadtypes.h
 endif
 
 ifeq ($(subdir),inet)
-sysdep_headers += sys/socketvar.h netinet/in_systm.h \
-		  netinet/if_fddi.h netinet/if_tr.h netinet/igmp.h \
+sysdep_headers += netinet/if_fddi.h netinet/if_tr.h netinet/igmp.h \
 		  netipx/ipx.h netash/ash.h netax25/ax25.h netatalk/at.h \
 		  netrom/netrom.h netpacket/packet.h netrose/rose.h \
 		  neteconet/ec.h
diff --git a/sysdeps/unix/sysv/linux/sys/socketvar.h b/sysdeps/unix/sysv/linux/sys/socketvar.h
deleted file mode 100644
index 3945db124a..0000000000
--- a/sysdeps/unix/sysv/linux/sys/socketvar.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* This header is used on many systems but for Linux we have everything
-   already defined in the standard header.  */
-#include <sys/socket.h>