From bac99f2f3f3c7b368cd304d14188e473975e129f Mon Sep 17 00:00:00 2001
From: Anthony Green <green@moxielogic.com>
Date: Thu, 5 Jun 2025 06:12:10 -0400
Subject: [PATCH] Release candidate 1 for 3.5.0.  Windows build fixes. (#916)

* refactor(ci): improve wget retry logic in .ci/install.sh

* build(github-actions): use static runtime library in build

* refactor(ffi.h.in): export version API

* chore: update libffi version to 3.5.0-rc1
---
 .github/workflows/build.yml |  4 ++--
 README.md                   |  2 +-
 configure.ac                |  4 ++--
 include/ffi.h.in            | 26 +++++++++++++-------------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 663d6d90..c24d786f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -134,8 +134,8 @@ jobs:
             LDFLAGS="-no-undefined " \
             CPP="cl -nologo -EP" \
             CXXCPP="cl -nologo -EP" \
-            CPPFLAGS="-DFFI_BUILDING_DLL" \
-            CFLAGS="-DFFI_BUILDING_DLL" \
+            CPPFLAGS="-DFFI_BUILDING_DLL -DUSE_STATIC_RTL" \
+            CFLAGS="-DFFI_BUILDING_DLL -DUSE_STATIC_RTL" \
             AR='$(pwd)/.ci/ar-lib lib' \
             NM='dumpbin -symbols' STRIP=':' \
             $DEBUG_ARG || cat */config.log
diff --git a/README.md b/README.md
index cc706c3e..044afd83 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Status
 ======
 
-libffi-3.5.0-rc0 was released on June 2, 2025.  Check the libffi web
+libffi-3.5.0-rc1 was released on June 5, 2025.  Check the libffi web
 page for updates: <URL:http://sourceware.org/libffi/>.
 
 
diff --git a/configure.ac b/configure.ac
index 55adb14b..5b36c469 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,10 +2,10 @@ dnl Process this with autoconf to create configure
 
 AC_PREREQ([2.72])
 
-AC_INIT([libffi],[3.5.0-rc0],[http://github.com/libffi/libffi/issues])
+AC_INIT([libffi],[3.5.0-rc1],[http://github.com/libffi/libffi/issues])
 AC_CONFIG_HEADERS([fficonfig.h])
 
-FFI_VERSION_STRING="3.5.0-dev"
+FFI_VERSION_STRING="3.5.0-rc1"
 FFI_VERSION_NUMBER=30500
 AC_SUBST(FFI_VERSION_STRING)
 AC_SUBST(FFI_VERSION_NUMBER)
diff --git a/include/ffi.h.in b/include/ffi.h.in
index c97d7e0c..ba91c669 100644
--- a/include/ffi.h.in
+++ b/include/ffi.h.in
@@ -54,19 +54,6 @@ extern "C" {
 #define @TARGET@
 #endif
 
-/* ---- Version API ------------------------------------------------------ */
-
-#define FFI_VERSION_STRING "@FFI_VERSION_STRING@"
-#define FFI_VERSION_NUMBER @FFI_VERSION_NUMBER@
-
-#ifndef LIBFFI_ASM
-/* Return a version string. */
-const char *ffi_get_version (void);
-
-/* Return the version as an unsigned long value: (x * 10000 + y * 100 + z) */
-unsigned long ffi_get_version_number (void);
-#endif
-
 /* ---- System configuration information --------------------------------- */
 
 /* If these change, update src/mips/ffitarget.h. */
@@ -327,6 +314,19 @@ void ffi_java_raw_to_ptrarray (ffi_cif *cif, ffi_java_raw *raw, void **args) __a
 FFI_API
 size_t ffi_java_raw_size (ffi_cif *cif) __attribute__((deprecated));
 
+/* ---- Version API ------------------------------------------------------ */
+
+#define FFI_VERSION_STRING "@FFI_VERSION_STRING@"
+#define FFI_VERSION_NUMBER @FFI_VERSION_NUMBER@
+
+#ifndef LIBFFI_ASM
+/* Return a version string. */
+FFI_API const char *ffi_get_version (void);
+
+/* Return the version as an unsigned long value: (x * 10000 + y * 100 + z) */
+FFI_API unsigned long ffi_get_version_number (void);
+#endif
+
 /* ---- Definitions for closures ----------------------------------------- */
 
 #if FFI_CLOSURES