diff options
| author | Roland McGrath <roland@gnu.org> | 2005-12-20 21:53:22 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-12-20 21:53:22 +0000 |
| commit | 7d9642f06f29ae20264fbba1dc5aff8dd779bbfd (patch) | |
| tree | cd2c1130b13dfa1a6c8ed4e6b2af5961ae4cc32a | |
| parent | 287058ead3780c3a9ea64a2d09871f9c52db8f3b (diff) | |
| download | glibc-7d9642f06f29ae20264fbba1dc5aff8dd779bbfd.tar.gz glibc-7d9642f06f29ae20264fbba1dc5aff8dd779bbfd.tar.xz glibc-7d9642f06f29ae20264fbba1dc5aff8dd779bbfd.zip | |
* sysdeps/unix/sysv/linux/ifreq.h: File removed.
* sysdeps/unix/sysv/linux/ifreq.c: #include "kernel-features.h" here. * sysdeps/mach/hurd/ifreq.h: File removed. (__ifreq): Function moved to ... * sysdeps/mach/hurd/ifreq.c: ... here, new file.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ifreq.c | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ifreq.h | 41 |
3 files changed, 11 insertions, 42 deletions
diff --git a/ChangeLog b/ChangeLog index 03b12299ed..c9c8339e4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-12-20 Roland McGrath <roland@redhat.com> + + * sysdeps/unix/sysv/linux/ifreq.h: File removed. + * sysdeps/unix/sysv/linux/ifreq.c: #include "kernel-features.h" here. + + * sysdeps/mach/hurd/ifreq.h: File removed. + (__ifreq): Function moved to ... + * sysdeps/mach/hurd/ifreq.c: ... here, new file. + 2005-12-20 Ulrich Drepper <drepper@redhat.com> * sunrpc/auth_unix.c (auth_unix_ops): Mark as const. diff --git a/sysdeps/unix/sysv/linux/ifreq.c b/sysdeps/unix/sysv/linux/ifreq.c index 098f11750f..43d54014bc 100644 --- a/sysdeps/unix/sysv/linux/ifreq.c +++ b/sysdeps/unix/sysv/linux/ifreq.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2002, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1999,2002,2003,2004,2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Andreas Jaeger <aj@suse.de>. @@ -18,6 +18,7 @@ 02111-1307 USA. */ #include "ifreq.h" +#include "kernel-features.h" /* Variable to signal whether SIOCGIFCONF is not available. */ #if __ASSUME_SIOCGIFNAME == 0 || 1 diff --git a/sysdeps/unix/sysv/linux/ifreq.h b/sysdeps/unix/sysv/linux/ifreq.h deleted file mode 100644 index b92e0638e2..0000000000 --- a/sysdeps/unix/sysv/linux/ifreq.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Andreas Jaeger <aj@suse.de>. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <net/if.h> -#include <sys/socket.h> -#include <sys/ioctl.h> -#include "kernel-features.h" - - -extern void __ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd); - -static inline struct ifreq * -__if_nextreq (struct ifreq *ifr) -{ - return ifr + 1; -} - -static inline void -__if_freereq (struct ifreq *ifreqs, int num_ifs) -{ - free (ifreqs); -} |