1
0
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-07 16:05:05 -05:00

Compare commits

..

2 Commits

Author SHA1 Message Date
XMRig
9138690126 v6.23.0-dev 2025-06-16 02:05:43 +07:00
XMRig
d58061c903 Add detection for _aligned_malloc. 2025-06-15 20:06:19 +07:00
3 changed files with 16 additions and 10 deletions

View File

@@ -1,10 +1,16 @@
if (WITH_RANDOMX) if (WITH_RANDOMX)
include(CheckFunctionExists) include(CheckSymbolExists)
check_function_exists(posix_memalign HAVE_POSIX_MEMALIGN) if (WIN32)
check_symbol_exists(_aligned_malloc "stdlib.h" HAVE_ALIGNED_MALLOC)
if(HAVE_POSIX_MEMALIGN) if (HAVE_ALIGNED_MALLOC)
add_definitions(/DHAVE_POSIX_MEMALIGN) add_compile_definitions(HAVE_ALIGNED_MALLOC)
endif()
else()
check_symbol_exists(posix_memalign "stdlib.h" HAVE_POSIX_MEMALIGN)
if (HAVE_POSIX_MEMALIGN)
add_compile_definitions(HAVE_POSIX_MEMALIGN)
endif()
endif() endif()
add_definitions(/DXMRIG_ALGO_RANDOMX) add_definitions(/DXMRIG_ALGO_RANDOMX)

View File

@@ -412,7 +412,7 @@ inline void* rx_aligned_alloc(size_t size, size_t align) {
return 0; return 0;
}; };
# define rx_aligned_free(a) free(a) # define rx_aligned_free(a) free(a)
#elif defined(_MSC_VER) #elif defined(HAVE_ALIGNED_MALLOC)
# define rx_aligned_alloc(a, b) _aligned_malloc(a, b) # define rx_aligned_alloc(a, b) _aligned_malloc(a, b)
# define rx_aligned_free(a) _aligned_free(a) # define rx_aligned_free(a) _aligned_free(a)
#else #else
@@ -569,7 +569,7 @@ inline void* rx_aligned_alloc(size_t size, size_t align) {
return 0; return 0;
}; };
# define rx_aligned_free(a) free(a) # define rx_aligned_free(a) free(a)
#elif defined(_MSC_VER) #elif defined(HAVE_ALIGNED_MALLOC)
# define rx_aligned_alloc(a, b) _aligned_malloc(a, b) # define rx_aligned_alloc(a, b) _aligned_malloc(a, b)
# define rx_aligned_free(a) _aligned_free(a) # define rx_aligned_free(a) _aligned_free(a)
#else #else

View File

@@ -22,15 +22,15 @@
#define APP_ID "xmrig" #define APP_ID "xmrig"
#define APP_NAME "XMRig" #define APP_NAME "XMRig"
#define APP_DESC "XMRig miner" #define APP_DESC "XMRig miner"
#define APP_VERSION "6.22.4-dev" #define APP_VERSION "6.23.0-dev"
#define APP_DOMAIN "xmrig.com" #define APP_DOMAIN "xmrig.com"
#define APP_SITE "www.xmrig.com" #define APP_SITE "www.xmrig.com"
#define APP_COPYRIGHT "Copyright (C) 2016-2025 xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2025 xmrig.com"
#define APP_KIND "miner" #define APP_KIND "miner"
#define APP_VER_MAJOR 6 #define APP_VER_MAJOR 6
#define APP_VER_MINOR 22 #define APP_VER_MINOR 23
#define APP_VER_PATCH 4 #define APP_VER_PATCH 0
#ifdef _MSC_VER #ifdef _MSC_VER
# if (_MSC_VER >= 1930) # if (_MSC_VER >= 1930)