From: Eric S. Raymond <esr@thyrsus.com>
Date: Fri, 4 Feb 2005 03:12:57 +0000 (+0000)
Subject: getline -> cgetline.
X-Git-Tag: 2.0~392
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=10131f4148d32996badc7432cb5b9903dca873e0;p=super-star-trek.git

getline -> cgetline.
---

diff --git a/battle.c b/battle.c
index 6e35e12..1e6123f 100644
--- a/battle.c
+++ b/battle.c
@@ -1,8 +1,6 @@
-#ifdef SERGEEV
-#include <conio.h>
 #include <unistd.h>
+#include "conio.h"
 #include "sstlinux.h"
-#endif /* SERGEEV */
 #include "sst.h"
 
 void doshield(int i) {
diff --git a/io.c b/io.c
index 12a1993..91d9387 100644
--- a/io.c
+++ b/io.c
@@ -1,26 +1,14 @@
-#ifdef SERGEEV
 #define _GNU_SOURCE
-#endif /* SERGEEV */
 #include <stdio.h>
-#ifdef SERGEEV
 #include <unistd.h>
-#endif /* SERGEEV */
 #include <termios.h>
 #include <curses.h>
 #include <signal.h>
 #include <ctype.h>
 #include <stdarg.h>
-#ifdef SERGEEV
-#include <conio.h>
-#endif /* SERGEEV */
-#ifdef MSDOS
-#include <dos.h>
-#endif
-#include <time.h>
 
-#ifdef SERGEEV
+#include "conio.h"
 #include "sstlinux.h"
-#endif /* SERGEEV */
 #include "sst.h"
 
 #ifndef SERGEEV
@@ -336,7 +324,7 @@ void setpassword(void) {
 #endif /* SERGEEV */
 }
 
-void getline(char *line, int max) {
+void cgetline(char *line, int max) {
     if (curses) {
 #ifndef SERGEEV
 	wgetnstr(stdscr, line, max);
diff --git a/sst.h b/sst.h
index 9a33423..f6c0960 100644
--- a/sst.h
+++ b/sst.h
@@ -437,10 +437,11 @@ void iostart(int);
 void ioend(void);
 void setwnd(short);
 void warble(void);
-void getline(char *, int);
+void cgetline(char *, int);
 void waitfor(void);
 void setpassword(void);
 void commandhook(char *, int);
+void c_printf (char *format, ... );
 
 typedef struct {
         int wndleft,wndtop,wndright,wndbottom;
diff --git a/sstlinux.h b/sstlinux.h
index 6dfbecf..1080f96 100644
--- a/sstlinux.h
+++ b/sstlinux.h
@@ -1,7 +1,6 @@
 #ifndef __SSTLINUX_H
 #define __SSTLINUX_H
 
-int c_printf (char *format, ... );
 void sound(unsigned int);
 void nosound(void);