diff options
| author | Daniel Black <daniel@mariadb.org> | 2021-03-16 15:37:14 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2021-03-18 14:40:54 +1100 |
| commit | 5dbea46cfdc83f2455c7f4a43a4cc932192cfac6 (patch) | |
| tree | b1701c98d6bcca6afbd2ca23e19fa5070c8e1b26 /mysys | |
| parent | 60d1461a28cb49e8d4e9e7c57963c5d0391d484d (diff) | |
| download | mariadb-git-5dbea46cfdc83f2455c7f4a43a4cc932192cfac6.tar.gz | |
crc32c: Fix AIX compulation - ALIGN defined
ALIGN was defined already:
mysys/crc32/crc32c.cc:390: warning: "ALIGN" redefined
#define ALIGN(n, m) ((n + ((1 << m) - 1)) & ~((1 << m) - 1))
In file included from /root/aix/build/include/my_global.h:543,
from /root/aix/build/mysys/crc32/crc32c.cc:22:
/opt/freeware/lib/gcc/powerpc-ibm-aix7.1.0.0/8/include-fixed/sys/socket.h:788: note: this is the location of the previous definition
#define ALIGN(p) (ulong)((caddr_t)(p) + MACHINE_ALIGNMENT - 1 - \
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/crc32/crc32c.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysys/crc32/crc32c.cc b/mysys/crc32/crc32c.cc index 8135c211d2e..b6c80886ec1 100644 --- a/mysys/crc32/crc32c.cc +++ b/mysys/crc32/crc32c.cc @@ -386,6 +386,10 @@ uint32_t ExtendImpl(uint32_t crc, const char* buf, size_t size) { const uint8_t *e = p + size; uint64_t l = crc ^ 0xffffffffu; +#ifdef ALIGN +#undef ALIGN +#endif + // Align n to (1 << m) byte boundary #define ALIGN(n, m) ((n + ((1 << m) - 1)) & ~((1 << m) - 1)) |