Skip to content

Commit 551a257

Browse files
authored
Merge pull request unbit#2713 from niol/gcc15
fix build with gcc-15
2 parents af49d44 + 5d4dfdd commit 551a257

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

core/fifo.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,25 +78,25 @@ void uwsgi_master_fifo_prepare() {
7878
uwsgi_fifo_table['8'] = uwsgi_fifo_set_slot_eight;
7979
uwsgi_fifo_table['9'] = uwsgi_fifo_set_slot_nine;
8080

81-
uwsgi_fifo_table['-'] = uwsgi_cheaper_decrease;
82-
uwsgi_fifo_table['+'] = uwsgi_cheaper_increase;
83-
uwsgi_fifo_table['B'] = vassal_sos;
84-
uwsgi_fifo_table['c'] = uwsgi_chain_reload;
85-
uwsgi_fifo_table['C'] = uwsgi_go_cheap;
81+
uwsgi_fifo_table['-'] = (void (*)(int))uwsgi_cheaper_decrease;
82+
uwsgi_fifo_table['+'] = (void (*)(int))uwsgi_cheaper_increase;
83+
uwsgi_fifo_table['B'] = (void (*)(int))vassal_sos;
84+
uwsgi_fifo_table['c'] = (void (*)(int))uwsgi_chain_reload;
85+
uwsgi_fifo_table['C'] = (void (*)(int))uwsgi_go_cheap;
8686
uwsgi_fifo_table['E'] = emperor_rescan;
87-
uwsgi_fifo_table['f'] = uwsgi_refork_master;
88-
uwsgi_fifo_table['l'] = uwsgi_log_reopen;
89-
uwsgi_fifo_table['L'] = uwsgi_log_rotate;
87+
uwsgi_fifo_table['f'] = (void (*)(int))uwsgi_refork_master;
88+
uwsgi_fifo_table['l'] = (void (*)(int))uwsgi_log_reopen;
89+
uwsgi_fifo_table['L'] = (void (*)(int))uwsgi_log_rotate;
9090
uwsgi_fifo_table['p'] = suspend_resume_them_all;
91-
uwsgi_fifo_table['P'] = uwsgi_update_pidfiles;
91+
uwsgi_fifo_table['P'] = (void (*)(int))uwsgi_update_pidfiles;
9292
uwsgi_fifo_table['q'] = gracefully_kill_them_all;
9393
uwsgi_fifo_table['Q'] = kill_them_all;
9494
uwsgi_fifo_table['r'] = grace_them_all;
9595
uwsgi_fifo_table['R'] = reap_them_all;
9696
uwsgi_fifo_table['s'] = stats;
9797
uwsgi_fifo_table['S'] = subscriptions_blocker;
98-
uwsgi_fifo_table['w'] = uwsgi_reload_workers;
99-
uwsgi_fifo_table['W'] = uwsgi_brutally_reload_workers;
98+
uwsgi_fifo_table['w'] = (void (*)(int))uwsgi_reload_workers;
99+
uwsgi_fifo_table['W'] = (void (*)(int))uwsgi_brutally_reload_workers;
100100

101101
}
102102

core/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
extern struct uwsgi_server uwsgi;
44

55
struct http_status_codes {
6-
const char key[3];
6+
const char key[4];
77
const char *message;
88
int message_size;
99
};

core/master_utils.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
extern struct uwsgi_server uwsgi;
44

5-
void worker_wakeup() {
5+
void worker_wakeup(int sig) {
66
}
77

88
uint64_t uwsgi_worker_exceptions(int wid) {

plugins/fiber/fiber.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ struct uwsgi_option fiber_options[] = {
1515
};
1616

1717

18-
VALUE uwsgi_fiber_request() {
18+
VALUE uwsgi_fiber_request(RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg)) {
1919
async_schedule_to_req_green();
2020
return Qnil;
2121
}
2222

23-
VALUE rb_fiber_schedule_to_req() {
23+
VALUE rb_fiber_schedule_to_req(VALUE v) {
2424
int id = uwsgi.wsgi_req->async_id;
2525

2626
if (!uwsgi.wsgi_req->suspended) {

plugins/pypy/pypy_plugin.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ static void uwsgi_pypy_enable_threads() {
303303
}
304304
}
305305

306-
static void uwsgi_pypy_init_thread() {
306+
static void uwsgi_pypy_init_thread(int sig) {
307307
if (u_pypy_thread_attach) {
308308
pthread_mutex_lock(&upypy.attach_thread_lock);
309309
u_pypy_thread_attach();

0 commit comments

Comments
 (0)