diff options
| author | Andreas Jaeger <aj@suse.de> | 2012-03-28 16:39:25 +0200 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2012-04-03 09:13:59 +0200 |
| commit | b1aa60f32d34030b28bca04aeee084cd3bedecfa (patch) | |
| tree | 430b4c30f7a613b4b219528ec861de1b2c5b1172 /string | |
| parent | 39c59c35723120c32dc42dde4115bba92305179f (diff) | |
| download | glibc-b1aa60f32d34030b28bca04aeee084cd3bedecfa.tar.gz | |
Add __bswap_64 definition for non GCC compilers.
[BZ#13926]
Currently __bswap_64 is not defined at all for non-GCC compilers.
Define it but guard it with __GLIBC_HAVE_LONG_LONG.
endian.h uses __bswap_64, make the functions only available
if __GLIBC_HAVE_LONG_LONG is defined.
Diffstat (limited to 'string')
| -rw-r--r-- | string/byteswap.h | 6 | ||||
| -rw-r--r-- | string/endian.h | 23 |
2 files changed, 18 insertions, 11 deletions
diff --git a/string/byteswap.h b/string/byteswap.h index 18ca95d373..7d769573ad 100644 --- a/string/byteswap.h +++ b/string/byteswap.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997 Free Software Foundation, Inc. +/* Copyright (C) 1997, 2012 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 @@ -18,6 +18,8 @@ #ifndef _BYTESWAP_H #define _BYTESWAP_H 1 +#include <features.h> + /* Get the machine specific, optimized definitions. */ #include <bits/byteswap.h> @@ -31,7 +33,7 @@ /* Return a value with all bytes in the 32 bit argument swapped. */ #define bswap_32(x) __bswap_32 (x) -#if defined __GNUC__ && __GNUC__ >= 2 +#if __GLIBC_HAVE_LONG_LONG /* Return a value with all bytes in the 64 bit argument swapped. */ # define bswap_64(x) __bswap_64 (x) #endif diff --git a/string/endian.h b/string/endian.h index 13e8c75c9f..0c293f6379 100644 --- a/string/endian.h +++ b/string/endian.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1996, 1997, 2000, 2008 Free Software Foundation, Inc. +/* Copyright (C) 1992-2012 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 @@ -70,10 +70,13 @@ # define be32toh(x) __bswap_32 (x) # define le32toh(x) (x) -# define htobe64(x) __bswap_64 (x) -# define htole64(x) (x) -# define be64toh(x) __bswap_64 (x) -# define le64toh(x) (x) +# if __GLIBC_HAVE_LONG_LONG +# define htobe64(x) __bswap_64 (x) +# define htole64(x) (x) +# define be64toh(x) __bswap_64 (x) +# define le64toh(x) (x) +# endif + # else # define htobe16(x) (x) # define htole16(x) __bswap_16 (x) @@ -85,10 +88,12 @@ # define be32toh(x) (x) # define le32toh(x) __bswap_32 (x) -# define htobe64(x) (x) -# define htole64(x) __bswap_64 (x) -# define be64toh(x) (x) -# define le64toh(x) __bswap_64 (x) +# if __GLIBC_HAVE_LONG_LONG +# define htobe64(x) (x) +# define htole64(x) __bswap_64 (x) +# define be64toh(x) (x) +# define le64toh(x) __bswap_64 (x) +# endif # endif #endif |