From: Eric S. Raymond <esr@thyrsus.com>
Date: Tue, 25 Jul 2006 16:51:22 +0000 (+0000)
Subject: Scrap various ugly portability hacks.  They're no longer needed as
X-Git-Tag: 1.8~12
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=70de2818f39ff8e755812bc0725d28826de26711;p=vms-empire.git

Scrap various ugly portability hacks.  They're no longer needed as
everyone has ANSI C now.
---

diff --git a/Makefile b/Makefile
index 2edfdb3..b787afd 100644
--- a/Makefile
+++ b/Makefile
@@ -8,13 +8,6 @@
 
 VERS=$(shell sed <vms-empire.spec -n -e '/Version: \(.*\)/s//\1/p')
 
-# Change the line below for your system.  If you are on a Sun or Vax,
-# you may want BSD.
-
-SYS = LINUX
-#SYS = BSD
-#SYS = SYSV
-
 # Use -g to compile the program for debugging.
 
 #DEBUG = -g -DDEBUG -Wall
@@ -28,7 +21,7 @@ LIBS = -lncurses
 
 # You shouldn't have to modify anything below this line.
 
-CFLAGS = $(DEBUG) $(PROFILE) -D$(SYS)
+CFLAGS = $(DEBUG) $(PROFILE)
 
 FILES = \
 	attack.c \
diff --git a/compmove.c b/compmove.c
index 52a8dc7..5ee71bf 100644
--- a/compmove.c
+++ b/compmove.c
@@ -17,12 +17,7 @@ For each move the user wants us to make, we do the following:
     3)  Check to see if the game is over.
 */
 
-#ifdef SYSV
 #include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include "empire.h"
 #include "extern.h"
 
diff --git a/display.c b/display.c
index 9e46067..57674c1 100644
--- a/display.c
+++ b/display.c
@@ -1,4 +1,4 @@
-/* $Id: display.c,v 1.9 2006/07/25 15:59:54 esr Exp esr $  - (c) Copyright 1987, 1988 Chuck Simmons */
+/* $Id: display.c,v 1.10 2006/07/25 16:43:14 esr Exp esr $  - (c) Copyright 1987, 1988 Chuck Simmons */
 
 /*
  *    Copyright (C) 1987, 1988 Chuck Simmons
@@ -18,12 +18,7 @@ information:
 	point of view;
 */
 
-#ifdef SYSV
 #include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include <curses.h>
 #include "empire.h"
 #include "extern.h"
diff --git a/edit.c b/edit.c
index bcfab51..67dbf10 100644
--- a/edit.c
+++ b/edit.c
@@ -12,12 +12,7 @@ edit.c -- Routines to handle edit mode commands.
 */
 
 #include <stdio.h>
-#ifdef SYSV
 #include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include <curses.h>
 #include <ctype.h>
 #include "empire.h"
diff --git a/empire.h b/empire.h
index b7007fa..08ef7d8 100644
--- a/empire.h
+++ b/empire.h
@@ -20,24 +20,6 @@ empire.h -- type and constant declarations
 #define NULL 0
 #endif
 
-/* Redefine some functions for portability. */
-#ifdef LINUX
-#include <string.h>
-#elif SYSV
-char *memset();
-char *memcpy();
-#define bzero(dst,len) memset(dst,0,len)
-#else
-#define memcpy(dst,src,len) bcopy((src),(dst),(len))
-#define strchr(s,c) index(s,c)
-typedef char chtype;
-#define beep() (putchar('\7'))
-#define napms(d) (usleep((d)*1000))
-#endif
-
-
-
-
 typedef unsigned char uchar;
 
 #define ASSERT(x) if (!(x)) assert ("x", __FILE__, __LINE__);
diff --git a/game.c b/game.c
index dd43760..f59d4c5 100644
--- a/game.c
+++ b/game.c
@@ -11,12 +11,7 @@
 game.c -- Routines to initialize, save, and restore a game.
 */
 
-#ifdef SYSV
 #include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include <stdio.h>
 #include <ctype.h>
 #include "empire.h"
diff --git a/map.c b/map.c
index 886241f..c72574c 100644
--- a/map.c
+++ b/map.c
@@ -1,4 +1,4 @@
-/* $Id: map.c,v 1.5 2002/04/19 09:17:01 esr Exp esr $  - (c) Copyright 1987, 1988 Chuck Simmons */
+/* $Id: map.c,v 1.6 2006/07/25 15:19:49 esr Exp esr $  - (c) Copyright 1987, 1988 Chuck Simmons */
 
 /*
  *    Copyright (C) 1987, 1988 Chuck Simmons
@@ -14,12 +14,7 @@ This file contains routines for playing around with view_maps,
 real_maps, path_maps, and cont_maps.
 */
 
-#ifdef SYSV
 #include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include "empire.h"
 #include "extern.h"
 
diff --git a/object.c b/object.c
index e8d3556..f7d798b 100644
--- a/object.c
+++ b/object.c
@@ -11,12 +11,7 @@
 object.c -- routines for manipulating objects.
 */
 
-#ifdef SYSV
 #include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include <stdio.h>
 #include <ctype.h>
 #include "empire.h"
diff --git a/term.c b/term.c
index 7c380be..67a823d 100644
--- a/term.c
+++ b/term.c
@@ -30,6 +30,7 @@ to read the lines.  The new information is then displayed, and the
 */
 
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
 #include <curses.h>
 #include <ctype.h>