diff --git a/games/mille/mille.h b/games/mille/mille.h index 49a7bd2d560c..8c877be758cf 100644 --- a/games/mille/mille.h +++ b/games/mille/mille.h @@ -151,7 +151,9 @@ # ifdef SYSV # define srandom(x) srand(x) # define random() rand() +# endif +# if defined(SYSV) || defined(__FreeBSD__) # ifndef attron # define erasechar() _tty.c_cc[VERASE] # define killchar() _tty.c_cc[VKILL] @@ -163,6 +165,10 @@ # endif # endif SYSV +#ifndef reg +#define reg /* register */ +#endif + typedef struct { bool coups[NUM_SAFE]; bool can_go; diff --git a/games/mille/misc.c b/games/mille/misc.c index 5f1233e538e7..befc800d5e81 100644 --- a/games/mille/misc.c +++ b/games/mille/misc.c @@ -39,9 +39,7 @@ static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 5/31/93"; #include #include "mille.h" -#ifndef unctrl -#include "unctrl.h" -#endif +#include # ifdef attron diff --git a/games/mille/move.c b/games/mille/move.c index e7fac46e1e3a..dcf13ba48368 100644 --- a/games/mille/move.c +++ b/games/mille/move.c @@ -38,9 +38,7 @@ static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 5/31/93"; #include #include "mille.h" -#ifndef unctrl -#include "unctrl.h" -#endif +#include # ifdef attron # include diff --git a/games/mille/save.c b/games/mille/save.c index 253617bc1f1a..168a393ee1a1 100644 --- a/games/mille/save.c +++ b/games/mille/save.c @@ -41,9 +41,7 @@ static char sccsid[] = "@(#)save.c 8.1 (Berkeley) 5/31/93"; #include #include "mille.h" -#ifndef unctrl -#include "unctrl.h" -#endif +#include # ifdef attron # include diff --git a/games/mille/unctrl.h b/games/mille/unctrl.h deleted file mode 100644 index e908c944c8bc..000000000000 --- a/games/mille/unctrl.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 1982, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)unctrl.h 8.1 (Berkeley) 5/31/93 - */ - -/* - * unctrl.h - */ - -extern char *_unctrl[]; - -# define unctrl(ch) (_unctrl[ch & 0177])