patch up some comments to avoid cpp warnings about redefines.

This commit is contained in:
perry 2001-11-11 00:00:15 +00:00
parent fe9e809208
commit ea6b9b674d
2 changed files with 11 additions and 11 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: ioctl_compat.h,v 1.11 1998/02/13 23:14:52 thorpej Exp $ */
/* $NetBSD: ioctl_compat.h,v 1.12 2001/11/11 00:00:15 perry Exp $ */
/*
* Copyright (c) 1990, 1993
@ -96,7 +96,7 @@ struct sgttyb {
#define TANDEM 0x00000001 /* send stopc on out q full */
#define CBREAK 0x00000002 /* half-cooked mode */
#define LCASE 0x00000004 /* simulate lower case */
#define ECHO 0x00000008 /* echo input */
#define ECHO 0x00000008 /* enable echoing */
#define CRMOD 0x00000010 /* map \r to \r\n on output */
#define RAW 0x00000020 /* no i/o processing */
#define ODDP 0x00000040 /* get/send odd parity */
@ -128,18 +128,18 @@ struct sgttyb {
#define PRTERA 0x00020000 /* \ ... / erase */
#define CRTERA 0x00040000 /* " \b " to wipe out char */
#define TILDE 0x00080000 /* hazeltine tilde kludge */
#define MDMBUF 0x00100000 /*start/stop output on carrier*/
#define MDMBUF 0x00100000 /* DTR/DCD hardware flow control */
#define LITOUT 0x00200000 /* literal output */
#define TOSTOP 0x00400000 /*SIGSTOP on background output*/
#define FLUSHO 0x00800000 /* flush output to terminal */
#define TOSTOP 0x00400000 /* stop background jobs on output */
#define FLUSHO 0x00800000 /* output being flushed (state) */
#define NOHANG 0x01000000 /* (no-op) was no SIGHUP on carrier drop */
#define L001000 0x02000000
#define CRTKIL 0x04000000 /* kill line with " \b " */
#define PASS8 0x08000000
#define CTLECH 0x10000000 /* echo control chars as ^X */
#define PENDIN 0x20000000 /* tp->t_rawq needs reread */
#define PENDIN 0x20000000 /* re-echo input buffer at next read */
#define DECCTQ 0x40000000 /* only ^Q starts after ^S */
#define NOFLSH 0x80000000 /* no output flush on signal */
#define NOFLSH 0x80000000 /* don't flush output on signal */
#define TIOCLBIS _IOW('t', 127, int) /* bis local mode bits */
#define TIOCLBIC _IOW('t', 126, int) /* bic local mode bits */
#define TIOCLSET _IOW('t', 125, int) /* set entire local mode word */

View File

@ -1,4 +1,4 @@
/* $NetBSD: termios.h,v 1.23 2000/09/20 10:16:49 kleink Exp $ */
/* $NetBSD: termios.h,v 1.24 2001/11/11 00:00:16 perry Exp $ */
/*
* Copyright (c) 1988, 1989, 1993, 1994
@ -181,13 +181,13 @@
#if !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)
#define EXTPROC 0x00000800 /* external processing */
#endif /* !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE) */
#define TOSTOP 0x00400000 /* stop background jobs from output */
#define TOSTOP 0x00400000 /* stop background jobs on output */
#if !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)
#define FLUSHO 0x00800000 /* output being flushed (state) */
#define NOKERNINFO 0x02000000 /* no kernel output from VSTATUS */
#define PENDIN 0x20000000 /* XXX retype pending input (state) */
#define PENDIN 0x20000000 /* re-echo input buffer at next read */
#endif /* !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE) */
#define NOFLSH 0x80000000 /* don't flush after interrupt */
#define NOFLSH 0x80000000 /* don't flush output on signal */
typedef unsigned int tcflag_t;
typedef unsigned char cc_t;