diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1999-11-28 17:53:41 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1999-11-28 17:53:41 +0000 |
| commit | bf9222557000665061ff4f09e335f7967c7f7563 (patch) | |
| tree | 67ec9ebed78af2bd03692a68d339136ca96d01ff /lib/libcurses/curses.h | |
| parent | c9e68edb8a158c8b6c7d2cf14190384708a3eaa3 (diff) | |
update to ncurses-5.0-19991127
Diffstat (limited to 'lib/libcurses/curses.h')
| -rw-r--r-- | lib/libcurses/curses.h | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/lib/libcurses/curses.h b/lib/libcurses/curses.h index c345065b627..44844941c19 100644 --- a/lib/libcurses/curses.h +++ b/lib/libcurses/curses.h @@ -1,4 +1,4 @@ -/* $OpenBSD: curses.h,v 1.37 1999/08/22 17:42:44 millert Exp $ */ +/* $OpenBSD: curses.h,v 1.38 1999/11/28 17:53:40 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998 Free Software Foundation, Inc. * @@ -33,7 +33,7 @@ * and: Eric S. Raymond <esr@snark.thyrsus.com> * ****************************************************************************/ -/* $From: curses.h.in,v 1.84 1999/07/24 20:15:42 tom Exp $ */ +/* $From: curses.h.in,v 1.87 1999/11/14 00:21:57 tom Exp $ */ #ifndef __NCURSES_H #define __NCURSES_H @@ -50,7 +50,7 @@ /* These are defined only in curses.h, and are used for conditional compiles */ #define NCURSES_VERSION_MAJOR 5 #define NCURSES_VERSION_MINOR 0 -#define NCURSES_VERSION_PATCH 990821 +#define NCURSES_VERSION_PATCH 19991127 /* This is defined in more than one ncurses header, for identification */ #undef NCURSES_VERSION @@ -89,7 +89,7 @@ typedef unsigned long chtype; #if !defined(__cplusplus) #undef bool -typedef char bool; +typedef unsigned char bool; #endif #ifdef __cplusplus @@ -313,7 +313,14 @@ extern int TABSIZE; */ extern int ESCDELAY; /* ESC expire time in milliseconds */ +extern char ttytype[]; /* needed for backward compatibility */ + +/* + * These functions are extensions - not in XSI Curses. + */ extern char *keybound (int, int); +extern const char *curses_version (void); +extern int assume_default_colors (int, int); extern int define_key (char *, int); extern int keyok (int, bool); extern int resizeterm (int, int); @@ -321,8 +328,6 @@ extern int use_default_colors (void); extern int use_extended_names (bool); extern int wresize (WINDOW *, int, int); -extern char ttytype[]; /* needed for backward compatibility */ - /* * GCC (and some other compilers) define '__attribute__'; we're using this * macro to alert the compiler to flag inconsistencies in printf/scanf-like @@ -1342,6 +1347,14 @@ extern const char *_nc_visbuf(const char *); #endif #ifdef __cplusplus + +/* these names conflict with STL */ +#undef box +#undef clear +#undef erase +#undef move +#undef refresh + } #endif |