6236N/AThis patch updates the ordering of two header files in the

6236N/Apinentry-curses.c; without the fix the compilation fails with:

6236N/A"/var/tmp/userland-clone-new/components/pinentry/pinentry-0.9.7/pinentry/pinentry-curses.c", line 1028: duplicate case in switch: 13

6236N/A

6236N/AThe problem is caused by the the fact, that ERR definition in

6236N/Asys/regset.h on Solaris can overwrite ERR macro defined in curses.h.

6236N/AThe paths below describe the sources of the problematic macro expansion.

6236N/A

6236N/Apinentry/pinentry-curses.c:

6236N/A#include <curses.h>

6236N/A#include <signal.h>

6236N/A

6236N/A `-> #include <sys/ucontext.h>

6236N/A `-> #include <sys/regset.h>

6236N/A `-> #define ERR 13

6236N/A

6236N/A `-> #if !defined(ERR) || ((ERR) != -1)

6236N/A #define ERR (-1)

6236N/A #endif

6236N/A

6236N/AThe patch was developed internally.

6236N/A

6236N/A--- ./pinentry/pinentry-curses.c.orig Tue Jun 7 08:10:33 2016

6236N/A+++ ./pinentry/pinentry-curses.c Tue Jun 7 08:10:53 2016

6236N/A@@ -22,8 +22,8 @@

6236N/A #include <config.h>

6236N/A #endif

6236N/A #include <assert.h>

6236N/A-#include <curses.h>

6236N/A #include <signal.h>

6236N/A+#include <curses.h>

6236N/A #include <fcntl.h>

6236N/A #include <unistd.h>

6236N/A #include <stdlib.h>