From 9dd57278c02b9137bd8e5711a4486f0dd89475a2 Mon Sep 17 00:00:00 2001
From: tbeu <tbeu@users.noreply.github.com>
Date: Fri, 9 Feb 2024 20:20:51 +0100
Subject: [PATCH] Try Solaris and CygWin in CI [skip travis] [skip cirrus]
 [skip appveyor]

---
 .github/workflows/cmake.yml | 62 +++++++++++++++++++++++++++++++++++++
 getopt/getopt.h             |  2 +-
 getopt/getopt_long.c        |  2 +-
 3 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 3c587652..bebb8a11 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -116,3 +116,65 @@ jobs:
             ./build/matdump -d ./share/test_file.mat structure
             ./build/matdump -v ./share/test_file.mat
             ./build/matdump -v -f whos ./share/test_file.mat
+
+  build-solaris:
+    runs-on: ubuntu-latest
+    name: solaris-gcc
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 5
+      - name: Test with gcc
+        uses: vmactions/solaris-vm@v1
+        with:
+          release: 11.4
+          usesh: true
+          copyback: false
+          prepare: |
+            set -e
+            pkg install cmake gcc
+          run: |
+            set -e
+            mkdir build
+            cmake -S . -Bbuild -DCMAKE_BUILD_TYPE=Release -DMATIO_SHARED=OFF -DMATIO_MAT73=OFF
+            cmake --build build -- -j8
+            ./build/test_snprintf
+            ./build/test_mat -H
+            ./build/test_mat -L
+            ./build/test_mat -V
+            ./build/matdump -v -H
+            ./build/matdump -V
+            ./build/matdump -d ./share/test_file.mat structure
+            ./build/matdump -v ./share/test_file.mat
+            ./build/matdump -v -f whos ./share/test_file.mat
+
+  build-cygwin:
+    runs-on: windows-latest
+    name: windows-cygwin
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 5
+      - name: Setup Cygwin environment
+        uses: egor-tensin/setup-cygwin@v4
+        with:
+          packages: cmake gcc-g++ zlib-devel
+      - name: Configure Release
+        run: |
+          cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DMATIO_SHARED=OFF -DMATIO_MAT73=OFF
+      - name: Build with ${{ matrix.compiler }}
+        run: |
+          cmake --build build -- -j8
+      - name: Test
+        run: |
+          ./build/test_snprintf
+          ./build/test_mat -H
+          ./build/test_mat -L
+          ./build/test_mat -V
+          ./build/matdump -v -H
+          ./build/matdump -V
+          ./build/matdump -d ./share/test_file.mat structure
+          ./build/matdump -v ./share/test_file.mat
+          ./build/matdump -v -f whos ./share/test_file.mat
diff --git a/getopt/getopt.h b/getopt/getopt.h
index 741a2e94..5ff7494e 100644
--- a/getopt/getopt.h
+++ b/getopt/getopt.h
@@ -40,7 +40,7 @@
 #ifndef _GETOPT_H_
 #define _GETOPT_H_
 
-#if !defined(_WIN32) && !defined(_WIN64)
+#if !(defined(_WIN32) || defined(_WIN64) || defined(__SVR4) || defined(__svr4__))
 #   include <sys/cdefs.h>
 #endif
 
diff --git a/getopt/getopt_long.c b/getopt/getopt_long.c
index 00755ca7..eef74166 100644
--- a/getopt/getopt_long.c
+++ b/getopt/getopt_long.c
@@ -56,7 +56,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if !defined(_WIN32) && !defined(_WIN64)
+#if !(defined(_WIN32) || defined(_WIN64) || defined(__SVR4) || defined(__svr4__))
 #   include <sys/cdefs.h>
 #   include <err.h>
 #else