From e96f594afc265a5341942e9ef8492acf563c5096 Mon Sep 17 00:00:00 2001 From: fffe Date: Tue, 9 Jun 2026 01:22:11 -0700 Subject: [PATCH] Added missing maybe_unuseds attributes and fixed pkg-config check by @fffe --- configure.ac | 2 ++ src/display/canvas.h | 15 ++++++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index ffa85f27..743ed924 100644 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,8 @@ LT_INIT AC_PROG_CXX AX_CXX_COMPILE_STDCXX(20, noext, mandatory) +PKG_PROG_PKG_CONFIG + AC_DEFINE([API_VERSION], [21], [api version]) RAK_CHECK_CFLAGS diff --git a/src/display/canvas.h b/src/display/canvas.h index 9203044e..dfe97ece 100644 --- a/src/display/canvas.h +++ b/src/display/canvas.h @@ -132,8 +132,7 @@ Canvas::resize_term(std::pair dim) { inline unsigned int Canvas::get_x() { - int x; - [[maybe_unused]] int y; + [[maybe_unused]] int x, y; if (!m_daemon) { getyx(m_window, y, x); } else { @@ -144,7 +143,7 @@ Canvas::get_x() { inline unsigned int Canvas::get_y() { - int x, y; + [[maybe_unused]] int x, y; if (!m_daemon) { getyx(m_window, y, x); } else { @@ -155,8 +154,7 @@ Canvas::get_y() { inline unsigned int Canvas::width() { - int x; - [[maybe_unused]] int y; + [[maybe_unused]] int x, y; if (!m_daemon) { getmaxyx(m_window, y, x); } else { @@ -167,7 +165,7 @@ Canvas::width() { inline unsigned int Canvas::height() { - int x, y; + [[maybe_unused]] int x, y; if (!m_daemon) { getmaxyx(m_window, y, x); } else { @@ -257,8 +255,7 @@ Canvas::set_default_attributes(int attr) { inline int Canvas::get_screen_width() { - int x; - [[maybe_unused]] int y; + [[maybe_unused]] int x, y; if (!m_daemon) { getmaxyx(stdscr, y, x); } else { @@ -269,7 +266,7 @@ Canvas::get_screen_width() { inline int Canvas::get_screen_height() { - int x, y; + [[maybe_unused]] int x, y; if (!m_daemon) { getmaxyx(stdscr, y, x); } else {