From: Eric S. Raymond <esr@thyrsus.com>
Date: Fri, 4 Feb 2005 17:31:03 +0000 (+0000)
Subject: Don't use a compiler trick to initialize the conio library, because
X-Git-Tag: 2.0~374
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=6e230d76cb937fb122a79fb32547a6938b4490b9;p=super-star-trek.git

Don't use a compiler trick to initialize the conio library, because
later we'll need to make the choice about whether or not to use it
at runtime.
---

diff --git a/conio.c b/conio.c
index 27c38c3..9f51c31 100644
--- a/conio.c
+++ b/conio.c
@@ -31,7 +31,6 @@ 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 */
 {
@@ -47,7 +46,6 @@ 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 */
 {
@@ -61,9 +59,8 @@ 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 */
+void initconio (void)
 {
    int x,y;
    short pair;
@@ -93,7 +90,6 @@ 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)
diff --git a/io.c b/io.c
index e9cc3d7..9e66eb6 100644
--- a/io.c
+++ b/io.c
@@ -53,6 +53,7 @@ static void fastexit(int sig) {
 
 void iostart(int usecurses) {
 #ifdef SERGEEV
+    	initconio();
         textattr(7);
         clrscr();
         setwnd(FULLSCREEN_WINDOW);