Merge pull request #419 from MrAnno/fix-macos

Fix maxOS CI
axoflow · Dec 16, 2024 · 5e49d07 · 5e49d07
2 parents 91fe24e + d40d508
commit 5e49d07
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -46,6 +46,7 @@ jobs:
           PYTHONUSERBASE="${HOME}/python_packages"
           PKG_CONFIG_PATH="${HOMEBREW_PREFIX}/opt/openssl@3/lib/pkgconfig:${HOMEBREW_PREFIX}/opt/net-snmp/lib/pkgconfig:${HOMEBREW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}"
           CFLAGS="-I${HOMEBREW_PREFIX}/include/"
+          CXXFLAGS="-std=c++17"
 
           LDFLAGS="-L${HOMEBREW_PREFIX}/lib"
           THREADS="$(sysctl -n hw.physicalcpu)"
@@ -77,7 +78,7 @@ jobs:
           "
           PATH="${HOMEBREW_PREFIX}/opt/bison/bin:${HOMEBREW_PREFIX}/opt/libnet/bin:${HOMEBREW_PREFIX}/opt/net-snmp/bin:${HOMEBREW_PREFIX}/bin:${HOMEBREW_PREFIX}/sbin:${PYTHONUSERBASE}/bin:${PATH}"
 
-          gh_export HOMEBREW_PREFIX PYTHONUSERBASE CC CXX PKG_CONFIG_PATH THREADS CONFIGURE_FLAGS CFLAGS LDFLAGS CMAKE_CONFIGURE_FLAGS PATH
+          gh_export HOMEBREW_PREFIX PYTHONUSERBASE PKG_CONFIG_PATH THREADS CONFIGURE_FLAGS CFLAGS CXXFLAGS LDFLAGS CMAKE_CONFIGURE_FLAGS PATH
           gh_path "${PATH}"
 
           echo "ARCH: " $(arch)

diff --git a/lib/filterx/func-str.c b/lib/filterx/func-str.c
@@ -184,7 +184,7 @@ _string_with_cache_get_string_value(FilterXStringWithCache *self, gboolean ignor
 }
 
 static gboolean
-_cache_needle(guint64 index, FilterXExpr *value, gpointer user_data)
+_cache_needle(gsize index, FilterXExpr *value, gpointer user_data)
 {
   gboolean *ignore_case = ((gpointer *)user_data)[0];
   GPtrArray *cached_strings = ((gpointer *) user_data)[1];