games - mille - remove #ifdef madness

Submitted-by: Ulrich Spoerlein <uqs@spoerlein.net>

diff --git a/games/mille/mille.c b/games/mille/mille.c
index ff0670b..7fc0873 100644 (file)
--- a/games/mille/mille.c
+++ b/games/mille/mille.c
@@ -40,9 +40,7 @@
 
 # include      "mille.h"
 # include      <signal.h>
-# ifdef attron
-#      include <term.h>
-# endif        /* attron */
+# include      <term.h>
 
 /*
  * @(#)mille.c 1.3 (Berkeley) 5/10/83

diff --git a/games/mille/mille.h b/games/mille/mille.h
index caae9ab..9dc88ff 100644 (file)
--- a/games/mille/mille.h
+++ b/games/mille/mille.h
@@ -153,22 +153,9 @@
 # define       EXTENSIONPROMPT         7
 # define       OVERWRITEFILEPROMPT     8
 
-# ifdef        SYSV
-# define       srandom(x)      srand(x)
-# define       random()        rand()
-# endif
-
-# if defined(SYSV) || defined(__DragonFly__)
-# ifndef       attron
-#      define  erasechar()     _tty.c_cc[VERASE]
-#      define  killchar()      _tty.c_cc[VKILL]
-# endif
-# else
-# ifndef       erasechar
-#      define  erasechar()     _tty.sg_erase
-#      define  killchar()      _tty.sg_kill
-# endif
-# endif        /* SYSV */
+# define       erasechar()     _tty.c_cc[VERASE]
+# define       killchar()      _tty.c_cc[VKILL]
+# define       _tty            cur_term->Nttyb
 
 typedef struct {
        bool    coups[NUM_SAFE];

diff --git a/games/mille/misc.c b/games/mille/misc.c
index 7f02f6d..3a45886 100644 (file)
--- a/games/mille/misc.c
+++ b/games/mille/misc.c
@@ -40,12 +40,7 @@
 #include <termios.h>
 
 #include       "mille.h"
-
-
-# ifdef        attron
-#      include <term.h>
-#      define  _tty    cur_term->Nttyb
-# endif        /* attron */
+#include       <term.h>
 
 /*
  * @(#)misc.c  1.2 (Berkeley) 3/28/83

diff --git a/games/mille/move.c b/games/mille/move.c
index 4809e96..467ee76 100644 (file)
--- a/games/mille/move.c
+++ b/games/mille/move.c
@@ -39,11 +39,7 @@
 
 #include       "mille.h"
 #include       <unctrl.h>
-
-# ifdef        attron
-#      include <term.h>
-#      define  _tty    cur_term->Nttyb
-# endif        /* attron */
+#include       <term.h>
 
 /*
  * @(#)move.c  1.2 (Berkeley) 3/28/83

diff --git a/games/mille/save.c b/games/mille/save.c
index d8a68fd..18ed5e5 100644 (file)
--- a/games/mille/save.c
+++ b/games/mille/save.c
@@ -46,11 +46,7 @@
 #include "mille.h"
 
 #include <unctrl.h>
-
-# ifdef        attron
-#      include <term.h>
-#      define  _tty    cur_term->Nttyb
-# endif        /* attron */
+#include <term.h>
 
 /*
  * @(#)save.c  1.2 (Berkeley) 3/28/83