Second round of merging Sergeev changes.

[super-star-trek.git] / conio.c

diff --git a/conio.c b/conio.c
index adf42e5e58adfd0de2aa8489ab3a20551210f7a3..9c37ad5225c654155d7474ad6a1ea2ff3f0e56d5 100644 (file)
--- a/conio.c
+++ b/conio.c
@@ -31,6 +31,7 @@ char color_warning=1;
 int directvideo;
 WINDOW *conio_scr;
 
+#ifdef SERGEEV 
 /* Some internals... */
 static int colortab(int a) /* convert LINUX Color code to DOS-standard */
 {
@@ -46,6 +47,7 @@ static int colortab(int a) /* convert LINUX Color code to DOS-standard */
    }
    return COLOR_BLACK;
 } 
+#endif /* SERGEEV */
 
 static void docolor (int color) /* Set DOS-like text mode colors */
 {
@@ -59,6 +61,7 @@ static void docolor (int color) /* Set DOS-like text mode colors */
    wattron(conio_scr,COLOR_PAIR(1+(color&7)+((color&112)>>1))); 
 }
 
+#ifdef SERGEEV
 /* Call this before any call to linux conio - except the port functions ! */
 void __attribute__((constructor)) initconio (void) /* This is needed, because ncurses needs to be initialized */
 {
@@ -90,6 +93,7 @@ void __attribute__((constructor)) initconio (void) /* This is needed, because nc
    textcolor(7);
    textbackground(0);
 }
+#endif /* SERGEEV */
 
 /* Call this on exiting your program */
 void doneconio (void)