Skip to content

Commit 54c73b5

Browse files
Remi4001albfan
authored andcommitted
fix gcc15 build errors
1 parent 5cf443e commit 54c73b5

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/ctl/ctl-cli.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ void cli_printv(const char *fmt, bool prefix_time, va_list args)
8787
}
8888
}
8989

90-
void cli_printf_time_prefix(const char *fmt, va_list args)
90+
void cli_printf_time_prefix()
9191
{
9292
long long sec, usec;
9393
time_t now;
@@ -306,7 +306,7 @@ void cli_destroy(void)
306306
rl_on_new_line();
307307
rl_redisplay();
308308

309-
rl_message("");
309+
rl_message("%s", "");
310310
rl_callback_handler_remove();
311311
}
312312

src/ctl/ctl.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
#include "shl_dlist.h"
3333
#include "shl_log.h"
3434

35+
// Force readline to use va_list variants (fixes gcc15 compilation on certain distros)
36+
#define HAVE_STDARG_H
3537
/* *sigh* readline doesn't include all their deps, so put them last */
3638
#include <readline/history.h>
3739
#include <readline/readline.h>

src/ctl/sinkctl.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
#include "util.h"
4848
#include "config.h"
4949

50-
#include <readline/readline.h>
5150

5251
#define HISTORY_FILENAME ".miracle-sink.history"
5352

src/ctl/wifictl.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#include "util.h"
3535
#include "config.h"
3636

37-
#include <readline/readline.h>
3837

3938
#define HISTORY_FILENAME ".miracle-wifi.history"
4039

0 commit comments

Comments
 (0)