[NOSTRDUP]: Drop support for systems without strdup(). First commit

was incomplete.

diff --git a/src/lib/gen/Makefile b/src/lib/gen/Makefile
index ab34fc5cf589edb3b1dc1a4c696f54d6fc1ca051..befb7f9c55c21a83ebefccc70abee244ba959f3c 100644 (file)
--- a/src/lib/gen/Makefile
+++ b/src/lib/gen/Makefile
@@ -38,14 +38,13 @@ NTLIB = $(SRCDIR)\lib\libgen.lib
 OBJS =  chance.o copy.o disassoc.o \
        emp_config.o getstarg.o getstring.o io.o \
        ioqueue.o mapdist.o minmax.o numstr.o onearg.o \
-       parse.o plur.o queue.o round.o scthash.o \
-       strdup.o
+       parse.o plur.o queue.o round.o scthash.o
 
 NTOBJS = chance.obj copy.obj disassoc.obj \
        emp_config.obj getstarg.obj getstring.obj \
        io.obj ioqueue.obj mapdist.obj minmax.obj \
        numstr.obj onearg.obj parse.obj plur.obj queue.obj round.obj \
-       scthash.obj strdup.obj getopt.obj service.obj
+       scthash.obj getopt.obj service.obj
 
 all: $(LIB)
 

diff --git a/src/lib/gen/emp_config.c b/src/lib/gen/emp_config.c
index e277fbec05ee33d06b672647d9082fedd350cb2e..1189fa2f43574a1e6e25a74f2da6918cc607415c 100644 (file)
--- a/src/lib/gen/emp_config.c
+++ b/src/lib/gen/emp_config.c
@@ -54,11 +54,6 @@
 #include "optlist.h"
 #include "gen.h"               /* parse */
 
-/* for systems without strdup  */
-#ifdef NOSTRDUP
-extern char *strdup();
-#endif /* NOSTRDUP */
-
 /* Dummy one */
 static int emp_config_dummy;
 

diff --git a/src/lib/gen/strdup.c b/src/lib/gen/strdup.c
deleted file mode 100644 (file)
index 05c8e75..0000000
--- a/src/lib/gen/strdup.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  ---
- *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
- *
- *  ---
- *
- *  strdup.c: For systems without a strdup function
- * 
- *  Known contributors to this file:
- *     Yannick Tremblay
- */
-
-/* for systems without strdup() define NOSTRDUP */
-
-#include "prototypes.h"
-#ifdef NOSTRDUP
-
-char *
-strdup(char *x)
-{
-    char *y;
-
-    y = malloc((sizeof(char) * strlen(x)) + 1);
-    strcpy(y, x);
-    return y;
-}
-#endif /* NOSTRDUP  */

diff --git a/src/lib/lwp/lwp.c b/src/lib/lwp/lwp.c
index 558e33759c3ccde8928876ea7efa08efcb146f85..b6bd033b0934bdd0881fec883d4c179fd8400d3e 100644 (file)
--- a/src/lib/lwp/lwp.c
+++ b/src/lib/lwp/lwp.c
@@ -44,11 +44,6 @@ int LwpMaxpri = 0;           /* maximum priority so far */
 
 static sigset_t oldmask;
 
-/* for systems without strdup  */
-#ifdef NOSTRDUP
-extern char *strdup();
-#endif /* NOSTRDUP */
-
 static void lwpStackCheckInit(struct lwpProc *newp);
 static void lwpStackCheck(struct lwpProc *newp);
 static void lwpStackCheckUsed(struct lwpProc *newp);

diff --git a/src/lib/lwp/sem.c b/src/lib/lwp/sem.c
index 2ede982137cf68328a5f829ff5f4e7e5149691ae..275ab89d18390442c0a56b0edceeed74217d6dd8 100644 (file)
--- a/src/lib/lwp/sem.c
+++ b/src/lib/lwp/sem.c
@@ -29,11 +29,6 @@
 
 #if defined(_EMPTH_LWP)
 
-/* for systems without strdup  */
-#ifdef NOSTRDUP
-extern char *strdup();
-#endif /* NOSTRDUP */
-
 /*
  * create a lwpSemaphore.
  */