From 347feaad6a723ee91f424b0936340826c9b133ee Mon Sep 17 00:00:00 2001 From: Lukasz Dorau Date: Tue, 10 Sep 2024 10:27:57 +0200 Subject: [PATCH] Remove definitions of NAME_MAX Remove definitions of NAME_MAX since it is defined in limits.h. Signed-off-by: Lukasz Dorau --- src/provider/provider_os_memory_internal.h | 9 +++++++-- src/proxy_lib/proxy_lib.c | 3 +-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/provider/provider_os_memory_internal.h b/src/provider/provider_os_memory_internal.h index 81d729d27a..b9a863f0d0 100644 --- a/src/provider/provider_os_memory_internal.h +++ b/src/provider/provider_os_memory_internal.h @@ -8,6 +8,13 @@ #ifndef UMF_OS_MEMORY_PROVIDER_INTERNAL_H #define UMF_OS_MEMORY_PROVIDER_INTERNAL_H +#include + +#if defined(_WIN32) && !defined(NAME_MAX) +#include +#define NAME_MAX _MAX_FNAME +#endif /* defined(_WIN32) && !defined(NAME_MAX) */ + #include #include "critnib.h" @@ -24,8 +31,6 @@ typedef enum umf_purge_advise_t { UMF_PURGE_FORCE, } umf_purge_advise_t; -#define NAME_MAX 255 - typedef struct os_memory_provider_t { unsigned protection; // combination of OS-specific protection flags unsigned visibility; // memory visibility mode diff --git a/src/proxy_lib/proxy_lib.c b/src/proxy_lib/proxy_lib.c index 6c3ffa2721..4819313d1a 100644 --- a/src/proxy_lib/proxy_lib.c +++ b/src/proxy_lib/proxy_lib.c @@ -38,6 +38,7 @@ #endif #include +#include #include #include @@ -113,7 +114,6 @@ void proxy_lib_create_common(void) { umf_result_t umf_result; #ifndef _WIN32 -#define NAME_MAX 255 char shm_name[NAME_MAX]; if (util_env_var_has_str("UMF_PROXY", "page.disposition=shared-fd")) { @@ -136,7 +136,6 @@ void proxy_lib_create_common(void) { "named shared memory: %s", os_params.shm_name); } -#undef NAME_MAX #endif umf_result = umfMemoryProviderCreate(umfOsMemoryProviderOps(), &os_params,