diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2012-04-03 00:37:48 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2012-04-03 00:37:48 +0200 |
| commit | 4f25816d7562e74a474eed95e81290dea2702008 (patch) | |
| tree | d3df6a52f9b88b9bf1e902419c2110c3cec0b01a /bits | |
| parent | 7c7480b7428eda63f3bfabd7e5586326769480f9 (diff) | |
| parent | b013040f3a878efa578969a3006469220c9a3fd5 (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
sysdeps/i386/configure
Diffstat (limited to 'bits')
| -rw-r--r-- | bits/byteswap.h | 21 | ||||
| -rw-r--r-- | bits/ioctl-types.h | 4 |
2 files changed, 13 insertions, 12 deletions
diff --git a/bits/byteswap.h b/bits/byteswap.h index 45cb9471e3..6df2f28c02 100644 --- a/bits/byteswap.h +++ b/bits/byteswap.h @@ -1,5 +1,6 @@ /* Macros to swap the order of bytes in integer values. - Copyright (C) 1997,1998,2000-2002,2005,2008 Free Software Foundation, Inc. + Copyright (C) 1997,1998,2000-2002,2005,2008,2011 + 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 @@ -60,20 +61,20 @@ __bswap_32 (unsigned int __bsx) #if defined __GNUC__ && __GNUC__ >= 2 /* Swap bytes in 64 bit value. */ # define __bswap_constant_64(x) \ - ((((x) & 0xff00000000000000ull) >> 56) \ - | (((x) & 0x00ff000000000000ull) >> 40) \ - | (((x) & 0x0000ff0000000000ull) >> 24) \ - | (((x) & 0x000000ff00000000ull) >> 8) \ - | (((x) & 0x00000000ff000000ull) << 8) \ - | (((x) & 0x0000000000ff0000ull) << 24) \ - | (((x) & 0x000000000000ff00ull) << 40) \ - | (((x) & 0x00000000000000ffull) << 56)) + (__extension__ ((((x) & 0xff00000000000000ull) >> 56) \ + | (((x) & 0x00ff000000000000ull) >> 40) \ + | (((x) & 0x0000ff0000000000ull) >> 24) \ + | (((x) & 0x000000ff00000000ull) >> 8) \ + | (((x) & 0x00000000ff000000ull) << 8) \ + | (((x) & 0x0000000000ff0000ull) << 24) \ + | (((x) & 0x000000000000ff00ull) << 40) \ + | (((x) & 0x00000000000000ffull) << 56))) # define __bswap_64(x) \ (__extension__ \ ({ union { __extension__ unsigned long long int __ll; \ unsigned int __l[2]; } __w, __r; \ - if (__builtin_constant_p (x)) \ + if (__builtin_constant_p (x)) \ __r.__ll = __bswap_constant_64 (x); \ else \ { \ diff --git a/bits/ioctl-types.h b/bits/ioctl-types.h index 58b78a6af3..661887f95b 100644 --- a/bits/ioctl-types.h +++ b/bits/ioctl-types.h @@ -1,5 +1,5 @@ /* Structure types for pre-termios terminal ioctls. Generic Unix version. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1996,1997,2011 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 @@ -64,7 +64,7 @@ struct sgttyb }; #define _IOT_sgttyb /* Hurd ioctl type field. */ \ - _IOT (_IOTS (char), 6, _IOTS (short int), 1, 0, 0) + _IOT (_IOTS (char), 4, _IOTS (short int), 1, 0, 0) #if defined TIOCGWINSZ || defined TIOCSWINSZ /* Type of ARG for TIOCGWINSZ and TIOCSWINSZ requests. */ |