From: Bruno Haible Date: Mon, 1 Oct 2007 22:07:19 +0000 (+0200) Subject: Rename byteswap_.h to byteswap.in.h. X-Git-Tag: v0.0~179 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=293ec82ede14e2a6f3443637e5a8fb9da9ce3cbe;p=gnulib.git Rename byteswap_.h to byteswap.in.h. --- diff --git a/ChangeLog b/ChangeLog index b79124309..66f8bd700 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/lib/byteswap.in.h b/lib/byteswap.in.h new file mode 100644 index 000000000..ca8554431 --- /dev/null +++ b/lib/byteswap.in.h @@ -0,0 +1,45 @@ +/* byteswap.h - Byte swapping + Copyright (C) 2005, 2007 Free Software Foundation, Inc. + Written by Oskar Liljeblad , 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 */ diff --git a/lib/byteswap_.h b/lib/byteswap_.h deleted file mode 100644 index ca8554431..000000000 --- a/lib/byteswap_.h +++ /dev/null @@ -1,45 +0,0 @@ -/* byteswap.h - Byte swapping - Copyright (C) 2005, 2007 Free Software Foundation, Inc. - Written by Oskar Liljeblad , 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 */ diff --git a/m4/byteswap.m4 b/m4/byteswap.m4 index e71c80268..642c42cf8 100644 --- a/m4/byteswap.m4 +++ b/m4/byteswap.m4 @@ -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 @@ dnl Written by Oskar Liljeblad. AC_DEFUN([gl_BYTESWAP], [ - dnl Prerequisites of lib/byteswap_.h. + dnl Prerequisites of lib/byteswap.in.h. AC_CHECK_HEADERS([byteswap.h], [ BYTESWAP_H='' ], [ diff --git a/modules/byteswap b/modules/byteswap index 52659d2c9..37f521fe9 100644 --- a/modules/byteswap +++ b/modules/byteswap @@ -2,7 +2,7 @@ Description: 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 @@ BUILT_SOURCES += $(BYTESWAP_H) # We need the following in order to create 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