diff mbox series

meson.build: Remove ncurses workaround for OpenBSD

Message ID ZwnvT4srOStQopOr@humpty.home.comstyle.com (mailing list archive)
State New
Headers show
Series meson.build: Remove ncurses workaround for OpenBSD | expand

Commit Message

Brad Smith Oct. 12, 2024, 3:38 a.m. UTC
meson.build: Remove ncurses workaround for OpenBSD

OpenBSD 7.5 has upgraded to ncurses 6.4.

Signed-off-by: Brad Smith <brad@comstyle.com>
---
 meson.build | 2 +-
 ui/curses.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Daniel P. Berrangé Oct. 17, 2024, 9:52 a.m. UTC | #1
Cc'ing qemu-trivial

On Fri, Oct 11, 2024 at 11:38:55PM -0400, Brad Smith wrote:
> meson.build: Remove ncurses workaround for OpenBSD
> 
> OpenBSD 7.5 has upgraded to ncurses 6.4.
> 
> Signed-off-by: Brad Smith <brad@comstyle.com>
> ---
>  meson.build | 2 +-
>  ui/curses.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

> 
> diff --git a/meson.build b/meson.build
> index 4ea1984fc5..22e7629d81 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1374,7 +1374,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 ec61615f7c..4d0be9b37d 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


With regards,
Daniel
Michael Tokarev Oct. 18, 2024, 4:25 p.m. UTC | #2
12.10.2024 06:38, Brad Smith wrote:
> meson.build: Remove ncurses workaround for OpenBSD
> 
> OpenBSD 7.5 has upgraded to ncurses 6.4.

Queued to qemu-trivial tree, thanks!

/mjt
diff mbox series

Patch

diff --git a/meson.build b/meson.build
index 4ea1984fc5..22e7629d81 100644
--- a/meson.build
+++ b/meson.build
@@ -1374,7 +1374,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 ec61615f7c..4d0be9b37d 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