aboutsummaryrefslogtreecommitdiffstats
path: root/thread_pthread.c
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2020-05-01 18:46:09 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2020-05-01 19:28:23 +0900
commitdc3bc425bb7fd505bd7ee45ff88246b528614004 (patch)
tree91c9185afbd98cc752ec73c4f51b8b4f0eccbb33 /thread_pthread.c
parent41bbdd7806edd64e73fbca4bfda396946b694f24 (diff)
downloadruby-dc3bc425bb7fd505bd7ee45ff88246b528614004.tar.gz
Get rid of -Wgnu-folding-constant errors
Also renamed as like as a constant.
Diffstat (limited to 'thread_pthread.c')
-rw-r--r--thread_pthread.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/thread_pthread.c b/thread_pthread.c
index f5eebf5b58..ee2f7bc909 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -1572,14 +1572,17 @@ setup_communication_pipe_internal(int pipes[2])
# define SET_CURRENT_THREAD_NAME(name) prctl(PR_SET_NAME, name)
#endif
+enum {
+ THREAD_NAME_MAX =
#if defined(__linux__)
-static const size_t thread_name_max = 16;
+ 16
#elif defined(__APPLE__)
/* Undocumented, and main thread seems unlimited */
-static const size_t thread_name_max = 64;
+ 64
#else
-static const size_t thread_name_max = 16;
+ 16
#endif
+};
static VALUE threadptr_invoke_proc_location(rb_thread_t *th);
@@ -1593,7 +1596,7 @@ native_set_thread_name(rb_thread_t *th)
}
else if ((loc = threadptr_invoke_proc_location(th)) != Qnil) {
char *name, *p;
- char buf[thread_name_max];
+ char buf[THREAD_NAME_MAX];
size_t len;
int n;
@@ -1619,7 +1622,7 @@ static void
native_set_another_thread_name(rb_nativethread_id_t thread_id, VALUE name)
{
#if defined SET_ANOTHER_THREAD_NAME || defined SET_CURRENT_THREAD_NAME
- char buf[thread_name_max];
+ char buf[THREAD_NAME_MAX];
const char *s = "";
# if !defined SET_ANOTHER_THREAD_NAME
if (!pthread_equal(pthread_self(), thread_id)) return;