From 548973517bf07f293a1faa3dccd3c3fa6110a6b4 Mon Sep 17 00:00:00 2001 From: Renaud Fivet Date: Mon, 20 May 2013 15:16:19 +0800 Subject: [PATCH] termio and posix implement same prototypes. --- Makefile | 8 ++++---- efunc.h | 2 +- posix.c | 4 ++-- termio.c | 4 +++- posix.h => termio.h | 4 ++-- 5 files changed, 12 insertions(+), 10 deletions(-) rename posix.h => termio.h (78%) diff --git a/Makefile b/Makefile index 96bd554..7a80b1f 100644 --- a/Makefile +++ b/Makefile @@ -30,8 +30,8 @@ OBJ=basic.o bind.o buffer.o crypt.o display.o eval.o exec.o \ HDR=basic.h bind.h buffer.h crypt.h display.h ebind.h edef.h efunc.h \ estruct.h eval.h exec.h file.h fileio.h input.h isearch.h line.h \ - lock.h main.h pklock.h posix.h random.h region.h search.h spawn.h \ - utf8.h version.h window.h word.h wrapper.h + lock.h main.h pklock.h random.h region.h search.h spawn.h \ + termio.h utf8.h version.h window.h word.h wrapper.h # DO NOT ADD OR MODIFY ANY LINES ABOVE THIS -- make source creates them @@ -151,13 +151,13 @@ lock.o: lock.c lock.h estruct.h edef.h main.o: main.c main.h estruct.h crypt.h efunc.h edef.h ebind.h version.h names.o: names.c estruct.h crypt.h edef.h efunc.h line.h pklock.o: pklock.c pklock.h estruct.h -posix.o: posix.c posix.h estruct.h utf8.h +posix.o: posix.c termio.h estruct.h utf8.h random.o: random.c random.h estruct.h edef.h region.o: region.c region.h estruct.h edef.h search.o: search.c search.h estruct.h edef.h spawn.o: spawn.c spawn.h estruct.h edef.h tcap.o: tcap.c estruct.h edef.h -termio.o: termio.c estruct.h edef.h +termio.o: termio.c termio.h estruct.h edef.h utf8.o: utf8.c utf8.h vmsvt.o: vmsvt.c estruct.h edef.h vt52.o: vt52.c estruct.h edef.h diff --git a/efunc.h b/efunc.h index 55e09c0..3a76de5 100644 --- a/efunc.h +++ b/efunc.h @@ -36,7 +36,7 @@ #include "region.h" /* posix.c */ -#include "posix.h" +#include "termio.h" /* input.c */ #include "input.h" diff --git a/posix.c b/posix.c index 8412333..d014315 100644 --- a/posix.c +++ b/posix.c @@ -1,5 +1,5 @@ -/* posix.c -- implements posix.h */ -#include "posix.h" +/* posix.c -- implements termio.h */ +#include "termio.h" /* posix.c * diff --git a/termio.c b/termio.c index ac6d583..b262609 100644 --- a/termio.c +++ b/termio.c @@ -1,3 +1,4 @@ +#include "termio.h" /* TERMIO.C * @@ -273,7 +274,7 @@ void ttclose(void) * On CPM terminal I/O unbuffered, so we just write the byte out. Ditto on * MS-DOS (use the very very raw console output routine). */ -void ttputc( int c) { +int ttputc( int c) { #if VMS if (nobuf >= NOBUF) ttflush(); @@ -287,6 +288,7 @@ void ttputc( int c) { #if V7 | USG | BSD fputc(c, stdout); #endif + return 0 ; } /* diff --git a/posix.h b/termio.h similarity index 78% rename from posix.h rename to termio.h index fd4c891..5f41f92 100644 --- a/posix.h +++ b/termio.h @@ -1,5 +1,5 @@ -#ifndef _POSIX_H_ -#define _POSIX_H_ +#ifndef _TERMIO_H_ +#define _TERMIO_H_ void ttopen( void) ; void ttclose( void) ;