diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-07-24 01:36:01 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-07-24 01:36:01 +0000 |
commit | 1522c3682ccf373e9d393ca73350be284fcf773b (patch) | |
tree | a58f8e8e08b83b3101d235e86f7d869dc880ed4e /inet/netinet/in.h | |
parent | 60c966358ed6fa6ce3ded5426f46232cbfd8e0fd (diff) | |
download | glibc-1522c3682ccf373e9d393ca73350be284fcf773b.zip glibc-1522c3682ccf373e9d393ca73350be284fcf773b.tar.gz glibc-1522c3682ccf373e9d393ca73350be284fcf773b.tar.bz2 |
Update.cvs/libc-ud-970723
1997-07-24 03:14 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-deps.c: Complete rewrite to handle DT_AUXILIARY correctly.
* inet/Makefile (tests): Add htontest.
* inet/htontest.c: New file.
* inet/netinet/in.h: Cleanup optimization of ntoh/hton functions
when they are no noops.
* sysdeps/alpha/htonl.S: Don't define __ protected names.
* sysdeps/alpha/htons.S: Likewise.
* sysdeps/generic/htonl.c: Likewise.
* sysdeps/generic/htons.c: Likewise.
* sysdeps/i386/htonl.S: Likewise.
* sysdeps/i386/htons.S: Likewise.
* sysdeps/i386/i486/htonl.S: Likewise.
* sysdeps/vax/htonl.s: Likewise.
* sysdeps/vax/htons.s: Likewise.
* string/Makefile (headers): Add byteswap.h and bits/byteswap.h.
* string/byteswap.h: New file.
* sysdeps/generic/bits/byteswap.h: New file.
* sysdeps/i386/bits/byteswap.h: New file.
* sysdeps/generic/bits/htontoh.h: Removed.
* sysdeps/i386/bits/htontoh.h: Removed.
* misc/search.h: General cleanup. Don't define reentrant hsearch
functions uless __USE_GNU.
* nss/nsswitch.c: Pretty print.
* sunrpc/clnt_udp.c (clntudp_call): Initialize outlen to prevent
warning.
* sysdeps/unix/i386/sysdep.h (DO_CALL): Use lcall, binutils have
been fixed meanwhile.
Reported by Zack Weinberg <zack@rabi.phys.columbia.edu>.
1997-07-24 00:53 Philip Blundell <Philip.Blundell@pobox.com>
* db/hash/hash.c (init_hash): Only use statbuf.st_blksize if it
exists for this port.
1997-07-24 00:12 Philip Blundell <Philip.Blundell@pobox.com>
* sysdeps/standalone/arm/bits/errno.h (ESTALE): Add.
1997-07-22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* manual/argp.texi (Argp Option Vectors): Use @minus, not @math,
to format a proper minus sign.
1997-07-22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/m68k/fpu/fraiseexcpt.c: Don't handle FE_INEXACT
specially, the standard doesn't require it.
* math/test-fenv.c (test_exceptions): Add IGNORE_INEXACT argument,
if non-zero then don't test inexact flag. Callers changed.
(set_single_exc): Ignore inexact flag if underflow or overflow
exception is raised.
1997-07-23 05:10 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/sys/fsuid.h: New file.
Provided by Michael Deutschmann <ldeutsch@mail.netshop.net>.
* sysdeps/unix/sysv/linux/Makefile (headers): Add sys/fsuid.h.
* sysdeps/unix/sysv/linux/Dist: Add sys/fsuid.h.
1997-07-16 10:09 Fila Kolodny <fila@ibi.com>
* resolv/gethnamaddr.c: Define MAXHOSTNAMELEN as 256, since RFC 1034
and 1035 state that a fully qualified domain name cannot exceed 255
octets in length.
* resolv/nss_dns/dns-host.c: Likewise.
1997-07-22 09:54 H.J. Lu <hjl@gnu.ai.mit.edu>
* inet/netinet/in.h (htons): Fix typos.
* sysdeps/i386/bits/htontoh.h (__ntohs): Return the value.
1997-07-22 11:47 Ulrich Drepper <drepper@cygnus.com>
* nss/nsswitch.c (nss_lookup_function): Include function.def, not
functions.def.
Patch by Klaus Espenlaub <kespenla@hydra.informatik.uni-ulm.de>.
Diffstat (limited to 'inet/netinet/in.h')
-rw-r--r-- | inet/netinet/in.h | 41 |
1 files changed, 12 insertions, 29 deletions
diff --git a/inet/netinet/in.h b/inet/netinet/in.h index ac0d167..d2a366b 100644 --- a/inet/netinet/in.h +++ b/inet/netinet/in.h @@ -185,9 +185,9 @@ struct sockaddr_in struct sockaddr_in6 { __SOCKADDR_COMMON (sin6_); - u_int16_t sin6_port; /* Transport layer port # */ - u_int32_t sin6_flowinfo; /* IPv6 flow information */ - struct in6_addr sin6_addr; /* IPv6 address */ + u_int16_t sin6_port; /* Transport layer port # */ + u_int32_t sin6_flowinfo; /* IPv6 flow information */ + struct in6_addr sin6_addr; /* IPv6 address */ }; /* IPv6 multicast request. */ @@ -197,7 +197,7 @@ struct ipv6_mreq struct in6_addr ipv6mr_multiaddr; /* local IPv6 address of interface */ - int ipv6mr_ifindex; + int ipv6mr_ifindex; }; /* Get system-specific definitions. */ @@ -210,18 +210,17 @@ struct ipv6_mreq this was a short-sighted decision since on different systems the types may have different representations but the values are always the same. */ -extern u_int32_t __ntohl __P ((u_int32_t __netlong)); extern u_int32_t ntohl __P ((u_int32_t __netlong)); -extern u_int16_t __ntohs __P ((u_int16_t __netshort)); extern u_int16_t ntohs __P ((u_int16_t __netshort)); -extern u_int32_t __htonl __P ((u_int32_t __hostlong)); extern u_int32_t htonl __P ((u_int32_t __hostlong)); -extern u_int16_t __htons __P ((u_int16_t __hostshort)); extern u_int16_t htons __P ((u_int16_t __hostshort)); #include <endian.h> -#if __BYTE_ORDER == __BIG_ENDIAN +/* Get machine dependent optimized versions of byte swapping functions. */ +#include <bits/byteswap.h> + +#if __BYTE_ORDER == __BIG_ENDIAN && defined __OPTIMIZE__ /* The host byte order is the same as network byte order, so these functions are all just identity. */ # define ntohl(x) (x) @@ -230,26 +229,10 @@ extern u_int16_t htons __P ((u_int16_t __hostshort)); # define htons(x) (x) #else # if __BYTE_ORDER == __LITTLE_ENDIAN && defined __OPTIMIZE__ -# define ntohl(x) (__builtin_constant_p (x) \ - ? __constant_htontohl (x) : __ntohl (x)) -# define ntohs(x) (__builtin_constant_p (x) \ - ? __constant_htontohs (x) : __ntohs (x)) -# define htonl(x) (__builtin_constant_p (x) \ - ? __constant_htontohl (x) : __htonl (x)) -# define htons(x) (__builtin_constant_p (x) \ - ? __constant_htontohl (x) : __htonl (x)) - -# define __constant_htontohl(x) \ - ((((x) & 0xff000000) >> 24) | \ - (((x) & 0x00ff0000) >> 8) | \ - (((x) & 0x0000ff00) << 8) | \ - (((x) & 0x000000ff) << 24)) -# define __constant_htontohs(x) \ - ((((x) & 0x0000ff00) >> 8) | \ - (((x) & 0x000000ff) << 8)) - -/* Now get machine dependent optimized versions for the real work. */ -# include <bits/htontoh.h> +# define ntohl(x) __bswap_32 (x) +# define ntohs(x) __bswap_16 (x) +# define htonl(x) __bswap_32 (x) +# define htons(x) __bswap_16 (x) # endif #endif |