52 lines
1.4 KiB
Diff
52 lines
1.4 KiB
Diff
|
From 199dcd16027e3573f5eeaa4396c361cfec91cbe1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Susanooo <zhangchujun_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Fri, 25 Oct 2024 09:44:21 +0800
|
||
|
|
Subject: [PATCH] meson.build: Remove ncurses workaround for OpenBSD
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
meson.build: Remove ncurses workaround for OpenBSD
|
||
|
|
|
||
|
|
OpenBSD 7.5 has upgraded to ncurses 6.4.
|
||
|
|
|
||
|
|
Signed-off-by: Brad Smith <brad@comstyle.com>
|
||
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
||
|
|
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
|
||
|
|
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
||
|
|
Signed-off-by: zhangchujun <zhangchujun_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
meson.build | 2 +-
|
||
|
|
ui/curses.c | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/meson.build b/meson.build
|
||
|
|
index 4024f9a4bb..b3ee125b72 100644
|
||
|
|
--- a/meson.build
|
||
|
|
+++ b/meson.build
|
||
|
|
@@ -1139,7 +1139,7 @@ iconv = not_found
|
||
|
|
curses = not_found
|
||
|
|
if have_system and get_option('curses').allowed()
|
||
|
|
curses_test = '''
|
||
|
|
- #if defined(__APPLE__) || defined(__OpenBSD__)
|
||
|
|
+ #ifdef __APPLE__
|
||
|
|
#define _XOPEN_SOURCE_EXTENDED 1
|
||
|
|
#endif
|
||
|
|
#include <locale.h>
|
||
|
|
diff --git a/ui/curses.c b/ui/curses.c
|
||
|
|
index 8bde8c5cf7..26438486fc 100644
|
||
|
|
--- a/ui/curses.c
|
||
|
|
+++ b/ui/curses.c
|
||
|
|
@@ -38,7 +38,7 @@
|
||
|
|
#include "ui/input.h"
|
||
|
|
#include "sysemu/sysemu.h"
|
||
|
|
|
||
|
|
-#if defined(__APPLE__) || defined(__OpenBSD__)
|
||
|
|
+#ifdef __APPLE__
|
||
|
|
#define _XOPEN_SOURCE_EXTENDED 1
|
||
|
|
#endif
|
||
|
|
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|