getline -> cgetline.

diff --git a/battle.c b/battle.c
index 6e35e122d7621469e3ffcfe1bdb8921550c6069d..1e6123fb3835257be1249ba2b82e647bfcfc6793 100644 (file)
--- 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 12a1993e693272f9fd29ce546229e63d92ff7e88..91d938720346faba5942380b9a30460d86adec8a 100644 (file)
--- 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 9a3342367b9ba94676773ec7b066c75dfe9a0d7a..f6c0960df0bb9b366814a3cb58fed6081d3190a7 100644 (file)
--- 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 6dfbecf1a6568eedb32dfe7ec427e6fd44657353..1080f9691346a2c3c53adc8349ee315eaff6ffc7 100644 (file)
--- 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);