Land #937, remove unused C defines

libressl · Nov 8, 2023 · 34641e8 · 34641e8
2 parents 5db1aec + 557b5a1
commit 34641e8
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 31 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -0,0 +1,31 @@
+# GitHub Actions workflow to run tests on Android.
+name: "Android"
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: "Test ${{ matrix.name }}"
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: "Android 8-9"
+            min-nal: 26
+            max-nal: 28
+          - name: "Android 10-11"
+            min-nal: 29
+            max-nal: 30
+    steps:
+      - name: "Checkout repository"
+        uses: actions/checkout@v4
+
+      - name: "Run CI script"
+        run: ./scripts/test
+        env:
+          ARCH: "android"
+          MIN_NAL: "${{ matrix.min-nal }}"
+          MAX_NAL: "${{ matrix.max-nal }}"
diff --git a/.github/workflows/android_test.yml b/.github/workflows/android_test.yml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -129,7 +129,7 @@ if(WIN32)
 	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 	add_definitions(-D_CRT_DEPRECATED_NO_WARNINGS)
 	add_definitions(-D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS)
-	add_definitions(-DCPPFLAGS -DNO_SYSLOG -DNO_CRYPT)
+	add_definitions(-DNO_SYSLOG)
 	add_definitions(-DWIN32_LEAN_AND_MEAN)
 	if(NOT CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
 		add_definitions(-D_WIN32_WINNT=0x0600)