[PATCH 1/2] cfdisk: fix missing prototype for `get_wch`

[PATCH 1/2] cfdisk: fix missing prototype for `get_wch`

[Patrick Steinhardt]

The header <ncursesw/ncurses.h> defines the get_wch(3) function only
when `NCURSES_WIDECHAR` is defined. This define is actually getting set
in the same header file, but only in case `_XOPEN_SOURCE` is defined and
has a value of 500 or higher. As we already have the precedence of
defining `_XOPEN_SOURCE` to a value of 600 in some other files, simply
define it to the minimum required value of 500 in "cfdisk.c". This
silences a warning for `get_wch` being unknown.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
 disk-utils/cfdisk.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index 806bff837..8f590387f 100644
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -33,6 +33,10 @@
 # include <slang/slang.h>
 #endif
 
+#ifndef _XOPEN_SOURCE
+# define _XOPEN_SOURCE 500 /* for inclusion of get_wch */
+#endif
+
 #ifdef HAVE_SLCURSES_H
 # include <slcurses.h>
 #elif defined(HAVE_SLANG_SLCURSES_H)
-- 
2.17.0

[PATCH 2/2] rfkill: include <poll.h> instead of <sys/poll.h>

[Patrick Steinhardt]

The POSIX standard states that poll(3P) is being made available by
<poll.h>, not <sys/poll.h>. Most commands already include the correct
header, with the exception of rfkill. Fix that to avoid a warning on
musl-based systems.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
 sys-utils/rfkill.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-utils/rfkill.c b/sys-utils/rfkill.c
index 211316ce7..9c52fac3a 100644
--- a/sys-utils/rfkill.c
+++ b/sys-utils/rfkill.c
@@ -24,7 +24,7 @@
 #include <getopt.h>
 #include <libsmartcols.h>
 #include <linux/rfkill.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/syslog.h>
 #include <sys/time.h>
 
-- 
2.17.0

Re: [PATCH 1/2] cfdisk: fix missing prototype for `get_wch`

[Karel Zak]

On Tue, Apr 10, 2018 at 01:36:31PM +0100, Patrick Steinhardt wrote:
> The header <ncursesw/ncurses.h> defines the get_wch(3) function only
> when `NCURSES_WIDECHAR` is defined. This define is actually getting set

Oh, ncurses saga continues...  why someone has to define NCURSES_WIDECHAR 
when use ncursesw/ (wide-char!) directory ?

> in the same header file, but only in case `_XOPEN_SOURCE` is defined and
> has a value of 500 or higher. As we already have the precedence of
> defining `_XOPEN_SOURCE` to a value of 600 in some other files, simply
> define it to the minimum required value of 500 in "cfdisk.c". This
> silences a warning for `get_wch` being unknown.

OK, I'll apply the patch. Thanks.

    Karel

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

Re: [PATCH 1/2] cfdisk: fix missing prototype for `get_wch`

[Karel Zak]

On Tue, Apr 10, 2018 at 01:36:31PM +0100, Patrick Steinhardt wrote:
>  disk-utils/cfdisk.c | 4 ++++
>  1 file changed, 4 insertions(+)

Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

Re: [PATCH 2/2] rfkill: include <poll.h> instead of <sys/poll.h>

[Karel Zak]

On Tue, Apr 10, 2018 at 01:36:32PM +0100, Patrick Steinhardt wrote:
>  sys-utils/rfkill.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
 
 Applied, thanks.


-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com