From e196b7ddf53040055c49fe3f10b304ceddf42578 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sun, 16 May 1999 08:52:16 +0000 Subject: 1999-05-16 Roland McGrath * 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. --- sysdeps/generic/netinet/in_systm.h | 41 ++++++++++++++++++++++++++++++ sysdeps/generic/sys/socketvar.h | 3 +++ sysdeps/unix/sysv/linux/Dist | 2 -- sysdeps/unix/sysv/linux/Makefile | 3 +-- sysdeps/unix/sysv/linux/netinet/in_systm.h | 41 ------------------------------ sysdeps/unix/sysv/linux/sys/socketvar.h | 3 --- 6 files changed, 45 insertions(+), 48 deletions(-) create mode 100644 sysdeps/generic/netinet/in_systm.h create mode 100644 sysdeps/generic/sys/socketvar.h delete mode 100644 sysdeps/unix/sysv/linux/netinet/in_systm.h delete mode 100644 sysdeps/unix/sysv/linux/sys/socketvar.h (limited to 'sysdeps') diff --git a/sysdeps/generic/netinet/in_systm.h b/sysdeps/generic/netinet/in_systm.h new file mode 100644 index 0000000000..902fe6ea0e --- /dev/null +++ b/sysdeps/generic/netinet/in_systm.h @@ -0,0 +1,41 @@ +/* System specific type definitions for networking code. + Copyright (C) 1997 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 + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef _NETINET_IN_SYSTM_H +#define _NETINET_IN_SYSTM_H 1 + +#include +#include + +__BEGIN_DECLS + +/* + * Network order versions of various data types. Unfortunately, BSD + * assumes specific sizes for shorts (16 bit) and longs (32 bit) which + * don't hold in general. As a consequence, the network order versions + * may not reflect the actual size of the native data types. + */ + +typedef u_int16_t n_short; /* short as received from the net */ +typedef u_int32_t n_long; /* long as received from the net */ +typedef u_int32_t n_time; /* ms since 00:00 GMT, byte rev */ + +__END_DECLS + +#endif /* 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 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/netinet/in_systm.h b/sysdeps/unix/sysv/linux/netinet/in_systm.h deleted file mode 100644 index 902fe6ea0e..0000000000 --- a/sysdeps/unix/sysv/linux/netinet/in_systm.h +++ /dev/null @@ -1,41 +0,0 @@ -/* System specific type definitions for networking code. - Copyright (C) 1997 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 - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#ifndef _NETINET_IN_SYSTM_H -#define _NETINET_IN_SYSTM_H 1 - -#include -#include - -__BEGIN_DECLS - -/* - * Network order versions of various data types. Unfortunately, BSD - * assumes specific sizes for shorts (16 bit) and longs (32 bit) which - * don't hold in general. As a consequence, the network order versions - * may not reflect the actual size of the native data types. - */ - -typedef u_int16_t n_short; /* short as received from the net */ -typedef u_int32_t n_long; /* long as received from the net */ -typedef u_int32_t n_time; /* ms since 00:00 GMT, byte rev */ - -__END_DECLS - -#endif /* netinet/in_systm.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 -- cgit 1.4.1