Fix build error on windows x86

qgymib · Nov 9, 2024 · 55ec2c6 · 55ec2c6
1 parent f1a0be1
commit 55ec2c6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@
 ### Features
 1. Allow to build as shared library.
 
+### Fixed
+1. Fix build error on windows x86.
+
 
 ## v4.0.0 (2024/04/30)
 

diff --git a/include/cutest.h b/include/cutest.h
@@ -115,7 +115,7 @@ extern "C" {
 /**
  * @brief Development version.
  */
-#define CUTEST_VERSION_PREREL       1
+#define CUTEST_VERSION_PREREL       2
 
 /**
  * @brief Ensure the api is exposed as C function.

diff --git a/src/cutest.c b/src/cutest.c
@@ -24,8 +24,13 @@
  */
 #if defined(_MSC_VER)
 #   ifndef weak_alias
-#       define weak_alias(name, aliasname) \
-            __pragma(comment(linker,"/alternatename:" #aliasname "=" #name));
+#       if defined(_WIN64)
+#           define weak_alias(name, aliasname) \
+                __pragma(comment(linker,"/alternatename:" #aliasname "=" #name));
+#       else
+#           define weak_alias(name, aliasname) \
+                __pragma(comment(linker,"/alternatename:_" #aliasname "=_" #name));
+#       endif
 #   endif
 #elif defined(__GNUC__) || defined(__clang__) || defined(__ARMCOMPILER_VERSION)
 #   ifndef weak_alias
@@ -338,7 +343,7 @@ static LARGE_INTEGER _cutest_get_file_time_offset(void)
     return t;
 }
 
-static BOOL _cutest_init_timestamp_win32(PINIT_ONCE InitOnce, PVOID Parameter, PVOID* Context)
+static BOOL CALLBACK _cutest_init_timestamp_win32(PINIT_ONCE InitOnce, PVOID Parameter, PVOID* Context)
 {
     (void)InitOnce; (void)Parameter; (void)Context;