Skip to content

Commit c95b753

Browse files
committed
Debugging yaml
1 parent c241ad3 commit c95b753

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/workflows/cmake.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@ jobs:
9494
- name: Windows Clang Win64
9595
os: windows-latest
9696
compiler: clang-cl
97-
cmake-args: -G Ninja
97+
cmake-args: -G Ninja -D BLOSC_DUMP_CPU_INFO=ON
9898

9999
# OpenZL is quite fragile with MSVC
100100
- name: Windows MSVC Win64
101101
os: windows-latest
102102
compiler: cl
103-
cmake-args: -A x64 -D DEACTIVATE_OPENZL=ON
103+
cmake-args: -A x64 -D DEACTIVATE_OPENZL=ON -D BLOSC_DUMP_CPU_INFO=ON
104104

105105
- name: Windows GCC Ninja
106106
os: windows-latest

blosc/blosclz.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -621,10 +621,10 @@ int blosclz_compress(const int clevel, const void* input, int length,
621621
// See https://habr.com/en/company/yandex/blog/457612/
622622
#if defined(__AVX2__)
623623

624-
#if defined(_MSC_VER)
624+
#if (defined(_MSC_VER) && !defined(__clang__))
625625
#define ALIGNED_(x) __declspec(align(x))
626626
#else
627-
#if defined(__GNUC__)
627+
#if (defined(__GNUC__) || defined(__clang__))
628628
#define ALIGNED_(x) __attribute__ ((aligned(x)))
629629
#endif
630630
#endif

include/b2nd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ extern "C" {
3535
extern "C" {
3636
#endif
3737

38-
#if defined(_MSC_VER)
38+
#if (defined(_MSC_VER) && !defined(__clang__))
3939
#define B2ND_DEPRECATED(msg) __declspec(deprecated(msg))
4040
#elif defined(__GNUC__) || defined(__clang__)
4141
#define B2ND_DEPRECATED(msg) __attribute__((deprecated(msg)))

include/blosc2/blosc2-export.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
be exported by the blosc shared library.
1919
*/
2020
#if defined(BLOSC_SHARED_LIBRARY)
21-
#if defined(_MSC_VER)
21+
#if (defined(_MSC_VER) && !defined(__clang__))
2222
#define BLOSC_EXPORT __declspec(dllexport)
2323
#elif (defined(__GNUC__) && __GNUC__ >= 4) || defined(__clang__)
2424
#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)

0 commit comments

Comments
 (0)