Include atomics unconditionally.

.github/workflows/test.yml

@@ -14,11 +14,11 @@ jobs:
       matrix:
         os: [ ubuntu-latest, macos-latest, macos-13 ]
     steps:
-      - name: Checkout the repository
+      - name: Checkout
         uses: actions/checkout@master
-      - name: Compile the project
+      - name: Build
         run: make clean && make
-      - name: Test the project
+      - name: Test
         run: make test
 
   test-windows:
@@ -32,40 +32,46 @@ jobs:
         uses: actions/checkout@master
       - name: Setup MSVC
         uses: ilammy/msvc-dev-cmd@v1
-      - name: Build the project
+      - name: Build
         shell: cmd
         run: build_win
-      - name: Test the project
+      - name: Test
         shell: cmd
         run: build_win test
 
   test-mingw:
-    name: Build on Windows with Mingw (no test yet)
+    name: Build on Windows with Mingw
-    runs-on: windows-latest
+    runs-on: windows-2019
     defaults:
       run:
         shell: msys2 {0}
+    strategy:
+      matrix:
+        msystem: [ UCRT64, MINGW64, MINGW32, CLANG64 ]
     steps:
-      - name: Checkout the repository
+      - name: Checkout
         uses: actions/checkout@master
       - name: Setup Mingw
         uses: msys2/setup-msys2@v2
         with:
-          msystem: UCRT64
+          msystem: ${{ matrix.msystem }}
           update: true
           install: >-
             base-devel
             git
             gcc
-      - name: Build the project
+      - name: Build
         shell: cmd
-        run: make -j4 CC=gcc JANET_NO_AMALG=1
+        run: make -j4 CC=gcc
+      - name: Test 
+        shell: cmd
+        run: make test -j4 CC=gcc
 
   test-mingw-linux:
     name: Build and test with Mingw on Linux + Wine
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout the repository
+      - name: Checkout
         uses: actions/checkout@master
       - name: Setup Mingw and wine
         run: |
@@ -73,24 +79,24 @@ jobs:
           sudo apt-get update
           sudo apt-get install libstdc++6:i386 libgcc-s1:i386
           sudo apt-get install gcc-mingw-w64-x86-64-win32 wine wine32 wine64
-      - name: Compile the project
+      - name: Build
         run: make clean && make CC=x86_64-w64-mingw32-gcc LD=x86_64-w64-mingw32-gcc UNAME=MINGW RUN=wine
-      - name: Test the project
+      - name: Test
         run: make test UNAME=MINGW RUN=wine VERBOSE=1
 
   test-arm-linux:
     name: Build and test ARM32 cross compilation
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout the repository
+      - name: Checkout
         uses: actions/checkout@master
       - name: Setup qemu and cross compiler
         run: |
           sudo apt-get update
           sudo apt-get install gcc-arm-linux-gnueabi qemu-user
-      - name: Compile the project
+      - name: Build
         run: make RUN="qemu-arm -L /usr/arm-linux-gnueabi/" CC=arm-linux-gnueabi-gcc LD=arm-linux-gnueabi-gcc 
-      - name: Test the project
+      - name: Test
         run: make RUN="qemu-arm -L /usr/arm-linux-gnueabi/" SUBRUN="qemu-arm -L /usr/arm-linux-gnueabi/" test VERBOSE=1
 
   test-s390x-linux:

src/core/capi.c

@@ -31,11 +31,14 @@
 #ifndef JANET_SINGLE_THREADED
 #ifndef JANET_WINDOWS
 #include <pthread.h>
-#else
-#include <windows.h>
 #endif
 #endif
 
+/* Even if single threaded, include this for atomics! */
+#ifdef JANET_WINDOWS
+#include <windows.h>
+#endif
+
 #ifdef JANET_USE_STDATOMIC
 #include <stdatomic.h>
 /* We don't need stdatomic on most compilers since we use compiler builtins for atomic operations.