diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1998-08-14 23:02:35 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1998-08-14 23:02:35 +0000 |
| commit | 530af442d7f68edcc4b4632b66a34279f88645b1 (patch) | |
| tree | 7f70e552f9c7216a092276a7cd6d533a8f46e3f1 | |
| parent | fbe7a4e21ce2effe646980ca1214c125d94c70fd (diff) | |
don't define HAVE_* since it conflicts with other configure scripts
| -rw-r--r-- | lib/libcurses/Makefile | 4 | ||||
| -rw-r--r-- | lib/libcurses/lib_setup.c | 4 | ||||
| -rw-r--r-- | lib/libcurses/term.h | 14 |
3 files changed, 17 insertions, 5 deletions
diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile index 9e884d581f8..d091a7e96cc 100644 --- a/lib/libcurses/Makefile +++ b/lib/libcurses/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 1998/07/27 03:37:26 millert Exp $ +# $OpenBSD: Makefile,v 1.25 1998/08/14 23:02:33 millert Exp $ # Uncomment this to enable tracing in libcurses #CURSESTRACE=-DTRACE @@ -38,7 +38,7 @@ SRCS= access.c alloc_entry.c captoinfo.c codes.c comp_captab.c comp_error.c \ nc_panel.c parse_entry.c read_bsd_terminfo.c read_entry.c \ read_termcap.c resizeterm.c safe_sprintf.c sigaction.c softscroll.c \ trace_buf.c tries.c unctrl.c wresize.c write_entry.c -CFLAGS+= -I. -I${.CURDIR} -DTERMIOS ${CURSESTRACE} +CFLAGS+= -I. -I${.CURDIR} ${CURSESTRACE} # XXX - missing stuff here MAN= curs_addch.3 curs_addchstr.3 curs_addstr.3 curs_attr.3 curs_beep.3 \ curs_bkgd.3 curs_border.3 curs_clear.3 curs_color.3 curs_delch.3 \ diff --git a/lib/libcurses/lib_setup.c b/lib/libcurses/lib_setup.c index b382ddb57c9..6510f5e9fcd 100644 --- a/lib/libcurses/lib_setup.c +++ b/lib/libcurses/lib_setup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lib_setup.c,v 1.1 1998/07/23 21:19:24 millert Exp $ */ +/* $OpenBSD: lib_setup.c,v 1.2 1998/08/14 23:02:31 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998 Free Software Foundation, Inc. * @@ -59,7 +59,7 @@ MODULE_ID("$From: lib_setup.c,v 1.38 1998/04/04 19:08:22 juergen Exp $") ****************************************************************************/ #if HAVE_SIZECHANGE -# if !defined(sun) || !HAVE_TERMIOS_H +# if !defined(sun) || !TERMIOS # if HAVE_SYS_IOCTL_H # include <sys/ioctl.h> # endif diff --git a/lib/libcurses/term.h b/lib/libcurses/term.h index cc02d2e6b49..182975ef70a 100644 --- a/lib/libcurses/term.h +++ b/lib/libcurses/term.h @@ -1,4 +1,4 @@ -/* $OpenBSD: term.h,v 1.1 1998/07/23 21:20:05 millert Exp $ */ +/* $OpenBSD: term.h,v 1.2 1998/08/14 23:02:34 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998 Free Software Foundation, Inc. * @@ -57,6 +57,16 @@ extern "C" { * and BROKEN_LINKER definition (based on the system for which this was configured). */ +#ifdef __OpenBSD__ +#define BROKEN_LINKER 0 +#define TERMIOS 1 +#define NCURSES_CONST /*nothing*/ + +#include <termios.h> +#define TTY struct termios + +#else + #ifndef HAVE_TERMIOS_H #define HAVE_TERMIOS_H 1 #endif @@ -115,6 +125,8 @@ extern "C" { #endif /* HAVE_TERMIOS_H */ +#endif /* OpenBSD */ + #ifdef TERMIOS #define GET_TTY(fd, buf) tcgetattr(fd, buf) #define SET_TTY(fd, buf) tcsetattr(fd, TCSADRAIN, buf) |