diff options
author | Martin Wilke <miwi@FreeBSD.org> | 2007-04-15 19:07:20 +0000 |
---|---|---|
committer | Martin Wilke <miwi@FreeBSD.org> | 2007-04-15 19:07:20 +0000 |
commit | ad16bed5c6cf52372a3535f0ac2cdf618cca9da2 (patch) | |
tree | 4150a40fc07d4bfeeb9268ab0d2b21cb5d4084ca | |
parent | C/C++ preprocessor expands macros and processes '#if', '#include' and (diff) |
- Use termios.h
PR: 110440
Submitted by: Ed Schouten <ed@fxq.nl>
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=190024
-rw-r--r-- | cad/cider/files/patch-ar | 9 | ||||
-rw-r--r-- | cad/cider/files/patch-spice-common-src-lib-cp-complete.c | 20 |
2 files changed, 27 insertions, 2 deletions
diff --git a/cad/cider/files/patch-ar b/cad/cider/files/patch-ar index 913213835c24..1ea4d84e3892 100644 --- a/cad/cider/files/patch-ar +++ b/cad/cider/files/patch-ar @@ -1,6 +1,6 @@ --- spice/common/src/include/os_bsd.h.orig Sat Jan 29 19:14:37 1994 +++ spice/common/src/include/os_bsd.h Thu Jan 6 12:33:20 2000 -@@ -6,14 +6,22 @@ +@@ -6,20 +6,40 @@ * BSD and derivative systems */ @@ -24,8 +24,13 @@ -#define HAS_INDEX /* index( ) instead of strchr( ) */ #define HAS_BCOPY /* bcopy( ), bzero( ) */ #define HAS_BSDRANDOM /* srandom( ) and random( ) */ ++#ifdef __FreeBSD__ ++#define HAS_POSIXTTY /* <termios.h> */ ++#else #define HAS_BSDTTY /* <sgtty.h> */ -@@ -22,4 +30,12 @@ ++#endif + #define HAS_BSDDIRS /* <sys/dir.h> */ + #define HAS_BSDRUSAGE /* getrusage( ) */ #define HAS_BSDRLIMIT /* getrlimit( ) */ #define HAS_DUP2 #define HAS_GETWD /* getwd(buf) */ diff --git a/cad/cider/files/patch-spice-common-src-lib-cp-complete.c b/cad/cider/files/patch-spice-common-src-lib-cp-complete.c new file mode 100644 index 000000000000..745e66d8269c --- /dev/null +++ b/cad/cider/files/patch-spice-common-src-lib-cp-complete.c @@ -0,0 +1,20 @@ +--- spice/common/src/lib/cp/complete.c Wed Jun 19 05:55:38 1991 ++++ spice/common/src/lib/cp/complete.c Sat Mar 17 11:51:56 2007 +@@ -445,14 +445,14 @@ + ison = on; + + if (ison == true) { +- (void) ioctl(fileno(cp_in), TERM_GET, (char *) &OS_Buf); ++ tcgetattr(fileno(cp_in), &OS_Buf); + sbuf = OS_Buf; + sbuf.c_cc[VEOF] = 0; + sbuf.c_cc[VEOL] = ESCAPE; + sbuf.c_cc[VEOL2] = CNTRL_D; +- (void) ioctl(fileno(cp_in), TERM_SET, (char *) &sbuf); ++ tcsetattr(fileno(cp_in), TCSANOW, &OS_Buf); + } else { +- (void) ioctl(fileno(cp_in), TERM_SET, (char *) &OS_Buf); ++ tcsetattr(fileno(cp_in), TCSANOW, &OS_Buf); + } + + # endif |