<string.h> is ISO C, no need to #if it.

diff --git a/src/lib/commands/arm.c b/src/lib/commands/arm.c
index f9e48263d6e11e10c4b70eb77a5d86c92f8e3f21..a66175564e415a8f41c58a748e01d6fceaee12e2 100644 (file)
--- a/src/lib/commands/arm.c
+++ b/src/lib/commands/arm.c
@@ -33,9 +33,7 @@
  *     Steve McClure, 2000
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "misc.h"
 #include "player.h"
 #include "var.h"

diff --git a/src/lib/commands/budg.c b/src/lib/commands/budg.c
index c71589c0992387ec58f0c742ee081375e0a6f369..a60e52e949404fda2dcc7fe49adabca94f12ba2f 100644 (file)
--- a/src/lib/commands/budg.c
+++ b/src/lib/commands/budg.c
@@ -33,9 +33,7 @@
  *     Steve McClure, 1997-2000
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "misc.h"
 #include "player.h"
 #include "var.h"

diff --git a/src/lib/commands/buil.c b/src/lib/commands/buil.c
index abd10ae2660eea1ad4be0db892e7e4be70530eb9..5ce4308ebf9ecbcb81c86a2670a4ea8d3c38b213 100644 (file)
--- a/src/lib/commands/buil.c
+++ b/src/lib/commands/buil.c
@@ -32,9 +32,7 @@
  */
 
 #include <math.h>
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "misc.h"
 #include "player.h"
 #include "var.h"

diff --git a/src/lib/commands/edit.c b/src/lib/commands/edit.c
index beb3db008e397ff400ef9dd3a039b50bb82cf7e9..3575d21d69f8477c2650005a8340703f0ff3f7be 100644 (file)
--- a/src/lib/commands/edit.c
+++ b/src/lib/commands/edit.c
@@ -36,9 +36,7 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "misc.h"
 #include "player.h"
 #include "var.h"

diff --git a/src/lib/commands/improve.c b/src/lib/commands/improve.c
index 012e425507523e99abc41d8fb2db608604f71ea0..dc636a58adf7d0960bd2dfa7fc7028cc862a952e 100644 (file)
--- a/src/lib/commands/improve.c
+++ b/src/lib/commands/improve.c
@@ -31,9 +31,7 @@
  *     Steve McClure, 1996-2000
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "misc.h"
 #include "player.h"
 #include "var.h"

diff --git a/src/lib/commands/load.c b/src/lib/commands/load.c
index 9c7bdfd90e17a018e09dbc0e11695e6841d21b6c..5d2cb8bbeef57a54e2e169c4f32d39eb50e3116e 100644 (file)
--- a/src/lib/commands/load.c
+++ b/src/lib/commands/load.c
@@ -33,9 +33,7 @@
  *     Steve McClure, 1998-2000
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "misc.h"
 #include "player.h"
 #include "xy.h"

diff --git a/src/lib/commands/orde.c b/src/lib/commands/orde.c
index 22f67dc4998ea71ec4d082e24e48ef74e922a48b..8c8650262a0c98e03763cabe691ae4e77718494a 100644 (file)
--- a/src/lib/commands/orde.c
+++ b/src/lib/commands/orde.c
@@ -32,9 +32,7 @@
  *     Steve McClure, 2000
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"

diff --git a/src/lib/commands/powe.c b/src/lib/commands/powe.c
index ce27b66dfcb96c0b819662597e224478cb105ebf..f58f2c621293ef2df78dd10375a8bcc7b66cd544 100644 (file)
--- a/src/lib/commands/powe.c
+++ b/src/lib/commands/powe.c
@@ -33,9 +33,7 @@
  *     Steve McClure, 1998-2000
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "misc.h"
 #include "player.h"
 #include "var.h"

diff --git a/src/lib/commands/tend.c b/src/lib/commands/tend.c
index 88bd5cdd34353f13048635375bd762e1b7c3ff0c..91b72caad2e15a298e6c2989e27c33466e081b80 100644 (file)
--- a/src/lib/commands/tend.c
+++ b/src/lib/commands/tend.c
@@ -33,9 +33,7 @@
  *     Steve McClure, 2000
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "misc.h"
 #include "player.h"
 #include "var.h"

diff --git a/src/lib/commands/tran.c b/src/lib/commands/tran.c
index 945bc2c13c429c6e4434103ff701bcf590abf795..d4775af974a6c147e977403ee455b36fa1451e94 100644 (file)
--- a/src/lib/commands/tran.c
+++ b/src/lib/commands/tran.c
@@ -32,9 +32,7 @@
  *  
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "misc.h"
 #include "player.h"
 #include "var.h"

diff --git a/src/lib/common/file.c b/src/lib/common/file.c
index 183f0ec116010f6d93b5bb05948f9e59419d7280..1418657adea58c2c96a483691f5d0fec31c7be5e 100644 (file)
--- a/src/lib/common/file.c
+++ b/src/lib/common/file.c
@@ -32,9 +32,7 @@
  *     Steve McClure, 2000
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include <fcntl.h>
 #include <signal.h>
 #include <stdlib.h>
@@ -50,9 +48,6 @@
 #include "common.h"
 #include "gen.h"
 
-#ifdef Rel4
-#include <unistd.h>
-#endif
 
 static void fillcache(struct empfile *ep, int start);
 

diff --git a/src/lib/common/log.c b/src/lib/common/log.c
index 68f55fb3fcdbc612f86522ef295a8cc6a875b922..9a5abb1b95da091f07e2971202fb5ed499bf515e 100644 (file)
--- a/src/lib/common/log.c
+++ b/src/lib/common/log.c
@@ -40,9 +40,7 @@
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include <time.h>
 #include "deity.h"
 #include "player.h"

diff --git a/src/lib/common/type.c b/src/lib/common/type.c
index 8a192b1662408aeef96f72c873d44d6f7152c3c2..f082a634153591e5d050c429ef725587c6fb1203 100644 (file)
--- a/src/lib/common/type.c
+++ b/src/lib/common/type.c
@@ -32,9 +32,7 @@
  *     Steve McClure, 2000
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "misc.h"
 #include "ship.h"
 #include "land.h"

diff --git a/src/lib/gen/emp_config.c b/src/lib/gen/emp_config.c
index f6e025276f5a57c2c050c8674c93da70e19ee6dc..6b544d99025cd651018e1b3bc1e836e62772c593 100644 (file)
--- a/src/lib/gen/emp_config.c
+++ b/src/lib/gen/emp_config.c
@@ -45,9 +45,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>            /* atoi free atol */
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 
 #include "misc.h"
 #include "com.h"

diff --git a/src/lib/gen/numstr.c b/src/lib/gen/numstr.c
index 5002f5072a70a1f342934e4c8c38470aeef81d1a..eb234dcb2e266006c4dfcc525c385583d21fbcf0 100644 (file)
--- a/src/lib/gen/numstr.c
+++ b/src/lib/gen/numstr.c
@@ -31,9 +31,7 @@
  *     Steve McClure, 2000
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "misc.h"
 #include "gen.h"
 

diff --git a/src/lib/player/login.c b/src/lib/player/login.c
index 89783d685a6634be31ad70a0fe0803907fb4127c..4a185cde519da15339aa83027c5aafb859b0f22a 100644 (file)
--- a/src/lib/player/login.c
+++ b/src/lib/player/login.c
@@ -32,9 +32,7 @@
  *     Steve McClure, 2000
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "prototypes.h"
 #include "misc.h"
 #include "proto.h"

diff --git a/src/lib/subs/pr.c b/src/lib/subs/pr.c
index 0f30d222d6e3b129e56c39ea84cc179abcddef69..449553be330766029d95604a1ddb0083afcd8df8 100644 (file)
--- a/src/lib/subs/pr.c
+++ b/src/lib/subs/pr.c
@@ -40,9 +40,7 @@
  * more input data, etc.
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include <fcntl.h>
 #include <ctype.h>
 #include <stdarg.h>