Skip to content

Commit 9cbc251

Browse files
committed
Fix endianness detection for MSVC on ARM/ARM64 [skipp appveyor]
As reported by #287
1 parent 43c11ae commit 9cbc251

2 files changed

Lines changed: 25 additions & 4 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,26 @@ jobs:
104104
- name: Test
105105
run: ctest --no-tests=error --test-dir build --build-config ${{ matrix.configuration }} --parallel 8
106106

107+
build-windows-arm:
108+
name: windows-arm-msvc
109+
runs-on: windows-11-arm
110+
steps:
111+
- name: Checkout repository
112+
uses: actions/checkout@v6
113+
with:
114+
fetch-depth: 5
115+
submodules: recursive
116+
- name: Setup python environment
117+
uses: actions/setup-python@v6
118+
with:
119+
python-version: 3.13
120+
- name: Configure
121+
run: cmake -S . -B build -A ARM64 -DMATIO_SHARED=OFF -DMATIO_MAT73=OFF -DMATIO_WITH_ZLIB=OFF
122+
- name: Build with msvc
123+
run: cmake --build build --config Release
124+
- name: Test
125+
run: ctest --no-tests=error --test-dir build --build-config Release --parallel 8
126+
107127
build-openbsd:
108128
name: openbsd-clang
109129
runs-on: ubuntu-latest

src/matio_private.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,11 @@
9090
defined(__ppc__) || defined(__hpux) || defined(_MIPSEB) || defined(_POWER) || \
9191
defined(__s390__)
9292
#define MATIO_BE
93-
#elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || \
94-
defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || \
95-
defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || \
96-
defined(_M_X64) || defined(__bfin__) || defined(__loongarch64) || defined(__aarch64__)
93+
#elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || \
94+
defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || \
95+
defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || \
96+
defined(_M_X64) || defined(__bfin__) || defined(__loongarch64) || defined(__aarch64__) || \
97+
defined(_M_ARM64) || defined(_M_ARM)
9798
#define MATIO_LE
9899
#endif
99100

0 commit comments

Comments
 (0)