Mercurial > gnulib
changeset 28936:0035159088bc
Rename byteswap_.h to byteswap.in.h.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Tue, 02 Oct 2007 00:07:19 +0200 |
| parents | f7941527a481 |
| children | c4188a37eeb2 |
| files | ChangeLog lib/byteswap.in.h lib/byteswap_.h m4/byteswap.m4 modules/byteswap |
| diffstat | 5 files changed, 54 insertions(+), 51 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Oct 02 00:05:40 2007 +0200 +++ b/ChangeLog Tue Oct 02 00:07:19 2007 +0200 @@ -5,6 +5,9 @@ alloca_.h. * lib/argz.in.h: Renamed from lib/argz_.h. * modules/argz (Files, Makefile.am): Use argz.in.h instead of argz_.h. + * lib/byteswap.in.h: Renamed from lib/byteswap_.h. + * modules/byteswap (Files, Makefile.am): Use byteswap.in.h instead of + byteswap_.h. 2007-09-30 Bruno Haible <bruno@clisp.org>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lib/byteswap.in.h Tue Oct 02 00:07:19 2007 +0200 @@ -0,0 +1,45 @@ +/* byteswap.h - Byte swapping + Copyright (C) 2005, 2007 Free Software Foundation, Inc. + Written by Oskar Liljeblad <oskar@osk.mine.nu>, 2005. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +#ifndef _GL_BYTESWAP_H +#define _GL_BYTESWAP_H + +/* Given an unsigned 16-bit argument X, return the value corresponding to + X with reversed byte order. */ +#define bswap_16(x) ((((x) & 0x00FF) << 8) | \ + (((x) & 0xFF00) >> 8)) + +/* Given an unsigned 32-bit argument X, return the value corresponding to + X with reversed byte order. */ +#define bswap_32(x) ((((x) & 0x000000FF) << 24) | \ + (((x) & 0x0000FF00) << 8) | \ + (((x) & 0x00FF0000) >> 8) | \ + (((x) & 0xFF000000) >> 24)) + +/* Given an unsigned 64-bit argument X, return the value corresponding to + X with reversed byte order. */ +#define bswap_64(x) ((((x) & 0x00000000000000FFULL) << 56) | \ + (((x) & 0x000000000000FF00ULL) << 40) | \ + (((x) & 0x0000000000FF0000ULL) << 24) | \ + (((x) & 0x00000000FF000000ULL) << 8) | \ + (((x) & 0x000000FF00000000ULL) >> 8) | \ + (((x) & 0x0000FF0000000000ULL) >> 24) | \ + (((x) & 0x00FF000000000000ULL) >> 40) | \ + (((x) & 0xFF00000000000000ULL) >> 56)) + +#endif /* _GL_BYTESWAP_H */
--- a/lib/byteswap_.h Tue Oct 02 00:05:40 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -/* byteswap.h - Byte swapping - Copyright (C) 2005, 2007 Free Software Foundation, Inc. - Written by Oskar Liljeblad <oskar@osk.mine.nu>, 2005. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -#ifndef _GL_BYTESWAP_H -#define _GL_BYTESWAP_H - -/* Given an unsigned 16-bit argument X, return the value corresponding to - X with reversed byte order. */ -#define bswap_16(x) ((((x) & 0x00FF) << 8) | \ - (((x) & 0xFF00) >> 8)) - -/* Given an unsigned 32-bit argument X, return the value corresponding to - X with reversed byte order. */ -#define bswap_32(x) ((((x) & 0x000000FF) << 24) | \ - (((x) & 0x0000FF00) << 8) | \ - (((x) & 0x00FF0000) >> 8) | \ - (((x) & 0xFF000000) >> 24)) - -/* Given an unsigned 64-bit argument X, return the value corresponding to - X with reversed byte order. */ -#define bswap_64(x) ((((x) & 0x00000000000000FFULL) << 56) | \ - (((x) & 0x000000000000FF00ULL) << 40) | \ - (((x) & 0x0000000000FF0000ULL) << 24) | \ - (((x) & 0x00000000FF000000ULL) << 8) | \ - (((x) & 0x000000FF00000000ULL) >> 8) | \ - (((x) & 0x0000FF0000000000ULL) >> 24) | \ - (((x) & 0x00FF000000000000ULL) >> 40) | \ - (((x) & 0xFF00000000000000ULL) >> 56)) - -#endif /* _GL_BYTESWAP_H */
--- a/m4/byteswap.m4 Tue Oct 02 00:05:40 2007 +0200 +++ b/m4/byteswap.m4 Tue Oct 02 00:07:19 2007 +0200 @@ -1,5 +1,5 @@ -# byteswap.m4 serial 1 -dnl Copyright (C) 2005 Free Software Foundation, Inc. +# byteswap.m4 serial 2 +dnl Copyright (C) 2005, 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -8,7 +8,7 @@ AC_DEFUN([gl_BYTESWAP], [ - dnl Prerequisites of lib/byteswap_.h. + dnl Prerequisites of lib/byteswap.in.h. AC_CHECK_HEADERS([byteswap.h], [ BYTESWAP_H='' ], [
--- a/modules/byteswap Tue Oct 02 00:05:40 2007 +0200 +++ b/modules/byteswap Tue Oct 02 00:07:19 2007 +0200 @@ -2,7 +2,7 @@ Swap bytes of 16, 32 and 64 bit values. Files: -lib/byteswap_.h +lib/byteswap.in.h m4/byteswap.m4 Depends-on: @@ -15,9 +15,9 @@ # We need the following in order to create <byteswap.h> when the system # doesn't have one. -byteswap.h: byteswap_.h +byteswap.h: byteswap.in.h { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - cat $(srcdir)/byteswap_.h; \ + cat $(srcdir)/byteswap.in.h; \ } > $@-t mv -f $@-t $@ MOSTLYCLEANFILES += byteswap.h byteswap.h-t