Skip to content

Commit ccae3c2

Browse files
authored
Merge pull request #716 from ldorau/Remove_definitions_of_NAME_MAX
Remove definitions of NAME_MAX
2 parents e09715a + 347feaa commit ccae3c2

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/provider/provider_os_memory_internal.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@
88
#ifndef UMF_OS_MEMORY_PROVIDER_INTERNAL_H
99
#define UMF_OS_MEMORY_PROVIDER_INTERNAL_H
1010

11+
#include <limits.h>
12+
13+
#if defined(_WIN32) && !defined(NAME_MAX)
14+
#include <stdlib.h>
15+
#define NAME_MAX _MAX_FNAME
16+
#endif /* defined(_WIN32) && !defined(NAME_MAX) */
17+
1118
#include <umf/providers/provider_os_memory.h>
1219

1320
#include "critnib.h"
@@ -24,8 +31,6 @@ typedef enum umf_purge_advise_t {
2431
UMF_PURGE_FORCE,
2532
} umf_purge_advise_t;
2633

27-
#define NAME_MAX 255
28-
2934
typedef struct os_memory_provider_t {
3035
unsigned protection; // combination of OS-specific protection flags
3136
unsigned visibility; // memory visibility mode

src/proxy_lib/proxy_lib.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#endif
3939

4040
#include <assert.h>
41+
#include <limits.h>
4142
#include <stdio.h>
4243

4344
#include <umf/memory_pool.h>
@@ -113,7 +114,6 @@ void proxy_lib_create_common(void) {
113114
umf_result_t umf_result;
114115

115116
#ifndef _WIN32
116-
#define NAME_MAX 255
117117
char shm_name[NAME_MAX];
118118

119119
if (util_env_var_has_str("UMF_PROXY", "page.disposition=shared-fd")) {
@@ -136,7 +136,6 @@ void proxy_lib_create_common(void) {
136136
"named shared memory: %s",
137137
os_params.shm_name);
138138
}
139-
#undef NAME_MAX
140139
#endif
141140

142141
umf_result = umfMemoryProviderCreate(umfOsMemoryProviderOps(), &os_params,

0 commit comments

Comments
 (0)