From a3085a3059e080b144527c56476760b80cca6f28 Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Tue, 11 Dec 2018 16:48:11 +0100 Subject: [PATCH] Use varargs tparm on netbsd This needs to be defined _early_. --- configure.ac | 2 ++ src/fallback.cpp | 2 +- src/fallback.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 08c415739..5d83402f3 100644 --- a/configure.ac +++ b/configure.ac @@ -324,6 +324,7 @@ AC_CHECK_FUNCS( futimens clock_gettime ) AC_CHECK_FUNCS( getpwent flock ) AC_CHECK_FUNCS( dirfd ) +AC_CHECK_DECL( [__NetBSD__], AC_DEFINE([TPARM_VARARGS], 1, [ Make tparm take varargs ]) ) AC_CHECK_DECL( [mkostemp], [ AC_CHECK_FUNCS([mkostemp]) ] ) # @@ -554,6 +555,7 @@ AC_COMPILE_IFELSE( [ AC_LANG_PROGRAM( [ + #define TPARM_VARARGS 1 #if HAVE_NCURSES_H #include #elif HAVE_NCURSES_CURSES_H diff --git a/src/fallback.cpp b/src/fallback.cpp index d7e4e508e..91ed149ed 100644 --- a/src/fallback.cpp +++ b/src/fallback.cpp @@ -43,7 +43,7 @@ #include "fallback.h" // IWYU pragma: keep #include "util.h" // IWYU pragma: keep -#ifdef TPARM_SOLARIS_KLUDGE +#if defined(TPARM_SOLARIS_KLUDGE) #undef tparm char *tparm_solaris_kludge(char *str, long p1, long p2, long p3, long p4, diff --git a/src/fallback.h b/src/fallback.h index f8b7d4977..d3c624f98 100644 --- a/src/fallback.h +++ b/src/fallback.h @@ -63,7 +63,7 @@ struct winsize { #endif -#ifdef TPARM_SOLARIS_KLUDGE +#if defined(TPARM_SOLARIS_KLUDGE) /// Solaris tparm has a set fixed of paramters in its curses implementation, work around this here. #define tparm tparm_solaris_kludge char *tparm_solaris_kludge(char *str, long p1 = 0, long p2 = 0, long p3 = 0, long p4 = 0,