diff options
| author |   naddy <naddy@openbsd.org> | 2020-12-14 22:05:31 +0000 |
|---|---|---|
| committer | naddy <naddy@openbsd.org> | 2020-12-14 22:05:31 +0000 |
| commit | ba472a4f96d76f789a7b9f6ebd9e3a5ff2fe3101 (patch) | |
| tree | 590329d0229d787a0e0a7f932f10956724f67d64 | |
| parent | Make sure that the address families of a flow's source address, (diff) | |
| download | wireguard-openbsd-ba472a4f96d76f789a7b9f6ebd9e3a5ff2fe3101.tar.xz wireguard-openbsd-ba472a4f96d76f789a7b9f6ebd9e3a5ff2fe3101.zip | |
switch over ncurses to --enable-const
ncurses has a configure option that adds a few more consts to its
headers by way of the NCURSES_CONST define. Starting with version
6.0, this has become the default. OpenBSD is still on ncurses 5.7,
but FreeBSD and Linux have moved on. Enable the additional consts
to eliminate compiler warnings when sharing code with other platforms.
ok deraadt@ millert@
| -rw-r--r-- | lib/libcurses/curses.h | 10 | ||||
| -rw-r--r-- | lib/libcurses/term.h | 6 | ||||
| -rw-r--r-- | lib/libcurses/termcap.h | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/lib/libcurses/curses.h b/lib/libcurses/curses.h index d0566e47040..e9f688b3d4d 100644 --- a/lib/libcurses/curses.h +++ b/lib/libcurses/curses.h @@ -1,4 +1,4 @@ -/* $OpenBSD: curses.h,v 1.61 2010/09/06 17:26:17 nicm Exp $ */ +/* $OpenBSD: curses.h,v 1.62 2020/12/14 22:05:31 naddy Exp $ */ /**************************************************************************** * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * @@ -34,7 +34,7 @@ * and: Thomas E. Dickey 1996-on * ****************************************************************************/ -/* $Id: curses.h,v 1.61 2010/09/06 17:26:17 nicm Exp $ */ +/* $Id: curses.h,v 1.62 2020/12/14 22:05:31 naddy Exp $ */ #ifndef __NCURSES_H #define __NCURSES_H @@ -101,7 +101,7 @@ * doing so makes it incompatible with other implementations of X/Open Curses. */ #undef NCURSES_CONST -#define NCURSES_CONST /*nothing*/ +#define NCURSES_CONST const #undef NCURSES_INLINE #define NCURSES_INLINE inline @@ -1334,7 +1334,7 @@ extern NCURSES_EXPORT_VAR(int) TABSIZE; #define KEY_EVENT 0633 /* We were interrupted by an event */ #define KEY_MAX 0777 /* Maximum key value is 0633 */ -/* $Id: curses.h,v 1.61 2010/09/06 17:26:17 nicm Exp $ */ +/* $Id: curses.h,v 1.62 2020/12/14 22:05:31 naddy Exp $ */ /* * vile:cmode: * This file is part of ncurses, designed to be appended after curses.h.in @@ -1586,7 +1586,7 @@ extern NCURSES_EXPORT(const char *) _nc_viswibuf(const wint_t *); #endif #endif /* _XOPEN_SOURCE_EXTENDED */ -/* $Id: curses.h,v 1.61 2010/09/06 17:26:17 nicm Exp $ */ +/* $Id: curses.h,v 1.62 2020/12/14 22:05:31 naddy Exp $ */ /* * vile:cmode: * This file is part of ncurses, designed to be appended after curses.h.in diff --git a/lib/libcurses/term.h b/lib/libcurses/term.h index f3050c2a65a..119bcec494b 100644 --- a/lib/libcurses/term.h +++ b/lib/libcurses/term.h @@ -1,4 +1,4 @@ -/* $OpenBSD: term.h,v 1.15 2015/11/14 23:56:49 deraadt Exp $ */ +/* $OpenBSD: term.h,v 1.16 2020/12/14 22:05:31 naddy Exp $ */ /**************************************************************************** * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * @@ -34,7 +34,7 @@ /* and: Thomas E. Dickey 1995-on */ /****************************************************************************/ -/* $Id: term.h,v 1.15 2015/11/14 23:56:49 deraadt Exp $ */ +/* $Id: term.h,v 1.16 2020/12/14 22:05:31 naddy Exp $ */ /* ** term.h -- Definition of struct term @@ -68,7 +68,7 @@ extern "C" { */ #undef NCURSES_CONST -#define NCURSES_CONST /*nothing*/ +#define NCURSES_CONST const #undef NCURSES_SBOOL #define NCURSES_SBOOL signed char diff --git a/lib/libcurses/termcap.h b/lib/libcurses/termcap.h index 025e28f388f..648763d758c 100644 --- a/lib/libcurses/termcap.h +++ b/lib/libcurses/termcap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: termcap.h,v 1.10 2013/12/10 20:33:51 naddy Exp $ */ +/* $OpenBSD: termcap.h,v 1.11 2020/12/14 22:05:31 naddy Exp $ */ /**************************************************************************** * Copyright (c) 1998,2000 Free Software Foundation, Inc. * @@ -33,7 +33,7 @@ * and: Eric S. Raymond <esr@snark.thyrsus.com> * ****************************************************************************/ -/* $Id: termcap.h,v 1.10 2013/12/10 20:33:51 naddy Exp $ */ +/* $Id: termcap.h,v 1.11 2020/12/14 22:05:31 naddy Exp $ */ #ifndef NCURSES_TERMCAP_H_incl #define NCURSES_TERMCAP_H_incl 1 @@ -62,7 +62,7 @@ extern "C" #include <sys/types.h> #undef NCURSES_CONST -#define NCURSES_CONST /*nothing*/ +#define NCURSES_CONST const #undef NCURSES_OSPEED #define NCURSES_OSPEED int |