cheng/zlib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use built-in byte swaps if compiled solo.

Browse Source
This commit is contained in:
Mark Adler 2012-02-12 19:28:06 -08:00
parent 72e2c8f088
commit 5bbdc122ad
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zutil.h
View File

@ -245,7 +245,8 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
#define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr)) #define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
#define TRY_FREE(s, p) {if (p) ZFREE(s, p);} #define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
/* Reverse the bytes in a 64-bit or 32-bit or 16-bit value */ /* Reverse the bytes in a 32-bit value */
#ifndef Z_SOLO
# if defined(_WIN32) && (_MSC_VER >= 1300) && (defined(_M_IX86) || defined(_M_X64)) # if defined(_WIN32) && (_MSC_VER >= 1300) && (defined(_M_IX86) || defined(_M_X64))
# include <stdlib.h> # include <stdlib.h>
# pragma intrinsic(_byteswap_ulong) # pragma intrinsic(_byteswap_ulong)
@ -253,7 +254,9 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
# elif defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) # elif defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
# include <byteswap.h> # include <byteswap.h>
# define ZSWAP32(q) __builtin_bswap32(q) # define ZSWAP32(q) __builtin_bswap32(q)
#else # endif
#endif
#ifndef ZSWAP32
# define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \ # define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
(((q) & 0xff00) << 8) + (((q) & 0xff) << 24)) (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
#endif #endif