From: Ulrich Drepper Date: Tue, 26 Jun 2001 04:59:41 +0000 (+0000) Subject: Update. X-Git-Tag: cvs/pre-lgplv2_1~25 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=da0debaa44d30e57e2949d4e90ca0d5c4dc9e69c;p=glibc.git Update. * sysdeps/gnu/net/if.h: Correct _IOT_ifreq and add _IOT_ifreq_short and _IOT_ifreq_int. Patch by Mark Kettenis . --- diff --git a/ChangeLog b/ChangeLog index 46b241463e..7a9989ea38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2001-06-25 Ulrich Drepper + * sysdeps/gnu/net/if.h: Correct _IOT_ifreq and add _IOT_ifreq_short + and _IOT_ifreq_int. Patch by Mark Kettenis . + * elf/dl-deps.c (_dl_map_object_deps): Fix handling of failing _dl_catch_error calls. diff --git a/sysdeps/gnu/net/if.h b/sysdeps/gnu/net/if.h index 45d2937ea7..562dd44ba2 100644 --- a/sysdeps/gnu/net/if.h +++ b/sysdeps/gnu/net/if.h @@ -163,7 +163,9 @@ struct ifreq # define ifr_bandwidth ifr_ifru.ifru_ivalue /* link bandwidth */ # define ifr_qlen ifr_ifru.ifru_ivalue /* queue length */ # define ifr_newname ifr_ifru.ifru_newname /* New name */ -# define _IOT_ifreq _IOT(_IOTS(struct ifreq),1,0,0,0,0) /* not right */ +# define _IOT_ifreq _IOT(_IOTS(char),IFNAMSIZ,_IOTS(char),16,0,0) +# define _IOT_ifreq_short _IOT(_IOTS(char),IFNAMSIZ,_IOTS(short),1,0,0) +# define _IOT_ifreq_int _IOT(_IOTS(char),IFNAMSIZ,_IOTS(int),1,0,0) /* Structure used in SIOCGIFCONF request. Used to retrieve interface