X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=include%2Fnc_tparm.h;h=d2670a2bb5d4fcef71f34585eb17c07f283129be;hp=a8dbcacb1e3146e2299b02ebcffd505a1db78adc;hb=1379ab3f6cc5b92256708ecc4129b57928d62cf4;hpb=f79b52fddd95c7a6f1ead29ef9c39eb8cdf60795 diff --git a/include/nc_tparm.h b/include/nc_tparm.h index a8dbcacb..d2670a2b 100644 --- a/include/nc_tparm.h +++ b/include/nc_tparm.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2006,2010 Free Software Foundation, Inc. * + * Copyright (c) 2006-2017,2018 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -30,18 +30,25 @@ * Author: Thomas E. Dickey 2006 * ****************************************************************************/ -/* $Id: nc_tparm.h,v 1.5 2010/12/25 20:27:22 tom Exp $ */ +/* $Id: nc_tparm.h,v 1.9 2018/03/17 19:19:58 tom Exp $ */ #ifndef NC_TPARM_included #define NC_TPARM_included 1 +#include +#include + /* * Cast parameters past the formatting-string for tparm() to match the * assumption of the varargs code. */ #ifndef TPARM_ARG +#ifdef NCURSES_TPARM_ARG +#define TPARM_ARG NCURSES_TPARM_ARG +#else #define TPARM_ARG long #endif +#endif /* TPARAM_ARG */ #define TPARM_N(n) (TPARM_ARG)(n) @@ -66,7 +73,6 @@ #define TPARM_3(a,b,c,d) TPARM_4(a,b,c,d,0) #define TPARM_2(a,b,c) TPARM_3(a,b,c,0) #define TPARM_1(a,b) TPARM_2(a,b,0) -#define TPARM_1(a,b) TPARM_2(a,b,0) #define TPARM_0(a) TPARM_1(a,0) #endif