diff options
author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2012-02-04 22:06:23 +1100 |
---|---|---|
committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2012-02-05 11:24:14 +1100 |
commit | a5d1d4f0c520529c9c49bb3d2e82232144ca2f6d (patch) | |
tree | c5a1bdf9bf35743097aa932c9c7c214026307385 /include | |
parent | a3f43aaa7caf040a4a24c77384309c49876c11b6 (diff) | |
download | flac-a5d1d4f0c520529c9c49bb3d2e82232144ca2f6d.tar.gz |
Improve endswapping (especially purge ntohl).
Diffstat (limited to 'include')
-rw-r--r-- | include/share/Makefile.am | 1 | ||||
-rw-r--r-- | include/share/endswap.h | 49 |
2 files changed, 50 insertions, 0 deletions
diff --git a/include/share/Makefile.am b/include/share/Makefile.am index 2cc1cd35..217faac6 100644 --- a/include/share/Makefile.am +++ b/include/share/Makefile.am @@ -7,6 +7,7 @@ SUBDIRS = grabbag EXTRA_DIST = \ alloc.h \ compat.h \ + endswap.h \ getopt.h \ grabbag.h \ replaygain_analysis.h \ diff --git a/include/share/endswap.h b/include/share/endswap.h new file mode 100644 index 00000000..5262075e --- /dev/null +++ b/include/share/endswap.h @@ -0,0 +1,49 @@ +/* libFLAC - Free Lossless Audio Codec library + * Copyright (C) 2012 Xiph.org Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of the Xiph.org Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* It is assumed that this header will be included after "config.h". */ + +#if HAVE_BYTESWAP_H + +#include <byteswap.h> /* Linux */ + +#define ENDSWAP_INT(x) ((int) bswap_32 (x)) + +#elif defined _MSC_VER /* Windows. Apparently in <stdlib.h>. */ + +#define ENDSWAP_INT(x) ((int) _byteswap_ulong (x)) + +#else + +#define ENDSWAP_INT(x) ((((x) >> 24) & 0xFF) + (((x) >> 8) & 0xFF00) + (((x) & 0xFF00) << 8) + (((x) & 0xFF) << 24)) + +#endif + |