1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

Get rid of -Wgnu-folding-constant errors

Also renamed as like as a constant.
This commit is contained in:
Nobuyoshi Nakada 2020-05-01 18:46:09 +09:00
parent 41bbdd7806
commit dc3bc425bb
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6

View file

@ -1572,14 +1572,17 @@ setup_communication_pipe_internal(int pipes[2])
# define SET_CURRENT_THREAD_NAME(name) prctl(PR_SET_NAME, name) # define SET_CURRENT_THREAD_NAME(name) prctl(PR_SET_NAME, name)
#endif #endif
enum {
THREAD_NAME_MAX =
#if defined(__linux__) #if defined(__linux__)
static const size_t thread_name_max = 16; 16
#elif defined(__APPLE__) #elif defined(__APPLE__)
/* Undocumented, and main thread seems unlimited */ /* Undocumented, and main thread seems unlimited */
static const size_t thread_name_max = 64; 64
#else #else
static const size_t thread_name_max = 16; 16
#endif #endif
};
static VALUE threadptr_invoke_proc_location(rb_thread_t *th); 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) { else if ((loc = threadptr_invoke_proc_location(th)) != Qnil) {
char *name, *p; char *name, *p;
char buf[thread_name_max]; char buf[THREAD_NAME_MAX];
size_t len; size_t len;
int n; int n;
@ -1619,7 +1622,7 @@ static void
native_set_another_thread_name(rb_nativethread_id_t thread_id, VALUE name) native_set_another_thread_name(rb_nativethread_id_t thread_id, VALUE name)
{ {
#if defined SET_ANOTHER_THREAD_NAME || defined SET_CURRENT_THREAD_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 = ""; const char *s = "";
# if !defined SET_ANOTHER_THREAD_NAME # if !defined SET_ANOTHER_THREAD_NAME
if (!pthread_equal(pthread_self(), thread_id)) return; if (!pthread_equal(pthread_self(), thread_id)) return;