[PATCH] curses: remove hard-wired ncursesw include path

Daniel Kahn Gillmor dkg at fifthhorseman.net
Mon Jun 29 05:27:24 CEST 2015

On Wed 2015-06-24 08:31:19 -0400, Neal H. Walfield wrote:
> Hi,
> At Wed, 24 Jun 2015 09:52:56 +0000,
> Gergely Imreh wrote:
>> * pinentry/pinentry-curses.c: pkg-config finds the correct include
>> paths so should not hard-wire the path for the ncursesw header file.
> Thanks!  I've applied and pushed this.

hm, this is a reverse of 21e83f422667e431c1283b9ae3356fded3523e50, which
is a changeset i'm the author on.  the commit log for 21e83f states:

   Avoid implicit declaration of function addnwstr.
    * pinentry/pinentry-curses.c [HAVE_NCURSESW]: Include <ncursesw/curses.h>.
    [! HAVE_NCURSESW]: Only include <curses.h> in this case.
    When built with libncursesw, we see this problem:
    pinentry-curses.c:440:8: warning: implicit declaration of function ‘addnwstr’ [-Wimplicit-function-declaration]
            ADDCH (start[i]);

I ran into this on debian unstable systems.  If we revert it, i'm
concerned that this will mean restoring the warning again; i agree with
Gergely that pkg-config *should* do things properly and the additional
#ifdef shouldn't be needed, but that's not what i saw happening.

Maybe there's some other way to fix this cleanly?


More information about the Gnupg-devel mailing list