diff options
| author | Yann Collet <Cyan4973@users.noreply.github.com> | 2018-02-08 16:45:25 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-08 16:45:25 (GMT) |
| commit | f76ee4e267e567bbce611aecd91f41b5de3b44d5 (patch) | |
| tree | 533fca761a2b19e41a95d158a874c524a2e68510 | |
| parent | ea25250c990769a01606dacb4149d52466b1638e (diff) | |
| parent | c4671be550fa65241c46e9e3a9214d227fbfe27f (diff) | |
| download | lz4-f76ee4e267e567bbce611aecd91f41b5de3b44d5.zip lz4-f76ee4e267e567bbce611aecd91f41b5de3b44d5.tar.gz lz4-f76ee4e267e567bbce611aecd91f41b5de3b44d5.tar.bz2 | |
Merge pull request #469 from mathstuf/intel-windows-packing-selection
intel: do not use __attribute__((packed)) on Windows
| -rw-r--r-- | lib/lz4.c | 2 | ||||
| -rw-r--r-- | lib/xxhash.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -71,7 +71,7 @@ #ifndef LZ4_FORCE_MEMORY_ACCESS /* can be defined externally */ # if defined(__GNUC__) && ( defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) ) # define LZ4_FORCE_MEMORY_ACCESS 2 -# elif defined(__INTEL_COMPILER) || defined(__GNUC__) +# elif (defined(__INTEL_COMPILER) && !defined(_WIN32)) || defined(__GNUC__) # define LZ4_FORCE_MEMORY_ACCESS 1 # endif #endif diff --git a/lib/xxhash.c b/lib/xxhash.c index bcf1f1d..3fc97fd 100644 --- a/lib/xxhash.c +++ b/lib/xxhash.c @@ -52,7 +52,7 @@ #ifndef XXH_FORCE_MEMORY_ACCESS /* can be defined externally, on command line for example */ # if defined(__GNUC__) && ( defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) ) # define XXH_FORCE_MEMORY_ACCESS 2 -# elif defined(__INTEL_COMPILER) || \ +# elif (defined(__INTEL_COMPILER) && !defined(_WIN32)) || \ (defined(__GNUC__) && ( defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7S__) )) # define XXH_FORCE_MEMORY_ACCESS 1 # endif |