[FIX] Windows CI (#1568)

* fix: undef before * chore: bump rust packages * chore: update vcpkg
CCExtractor · Sep 12, 2023 · 280939d · 280939d
1 parent af6308b
commit 280939d
Show file tree

Hide file tree

Showing 4 changed files with 229 additions and 182 deletions.
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
@@ -40,8 +40,8 @@ jobs:
         id: vcpkg
         uses: friendlyanon/setup-vcpkg@v1
         with:
-          committish: "2023.06.20"
-          cache-version: "2"
+          committish: "2023.08.09"
+          cache-version: "3"
           ignore-reserve-cache-error: true
       - name: Install dependencies
         run: cd vcpkg && vcpkg integrate install && vcpkg install leptonica tesseract ffmpeg --triplet x64-windows-static
@@ -76,8 +76,8 @@ jobs:
         id: vcpkg
         uses: friendlyanon/setup-vcpkg@v1
         with:
-          committish: "2023.06.20"
-          cache-version: "2"
+          committish: "2023.08.09"
+          cache-version: "3"
           ignore-reserve-cache-error: true
       - name: Install dependencies
         run: cd vcpkg && vcpkg integrate install && vcpkg install leptonica tesseract ffmpeg --triplet x64-windows-static

diff --git a/src/lib_ccx/ccx_common_platform.h b/src/lib_ccx/ccx_common_platform.h
@@ -23,6 +23,7 @@
 		#define STDOUT_FILENO 1
 		#define STDERR_FILENO 2
 		#include "inttypes.h"
+		#undef UINT64_MAX
 		#define UINT64_MAX   _UI64_MAX
 		typedef int socklen_t;
 		typedef int ssize_t;