[brlcad-commits] CVS: brlcad/src/sig a-d.c, 14.8, 14.9 bw-d.c, 14.8, 14.9 d-a.c, 14.6, 14.7 d-bw.c, 14.8, 14.9 d-f.c, 14.9, 14.10 d-i.c, 14.8, 14.9 d-u.c, 14.8, 14.9 d2-c.c, 14.7, 14.8 damdf.c, 14.7, 14.8 dauto.c, 14.7, 14.8 dauto2.c, 14.7, 14.8 dconv.c, 14.7, 14.8 ddisp.c, 14.8, 14.9 dfft.c, 14.11, 14.12 dmod.c, 14.10, 14.11 dpeak.c, 14.7, 14.8 dstat.c, 14.9, 14.10 dwin.c, 14.8, 14.9 f-d.c, 14.8, 14.9 f-i.c, 14.8, 14.9 fhor.c, 14.7, 14.8 fhor2.c, 14.7, 14.8 fhor3.c, 14.7, 14.8 i-d.c, 14.8, 14.9 i-f.c, 14.8, 14.9 ihist.c, 14.8, 14.9 imod.c, 14.12, 14.13 istat.c, 14.9, 14.10 u-d.c, 14.8, 14.9 u-f.c, 14.8, 14.9 umod.c, 14.11, 14.12 ustat.c, 14.9, 14.10

[Sean M. <br...@us...>]

Update of /cvsroot/brlcad/brlcad/src/sig
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16914/src/sig

Modified Files:
	a-d.c bw-d.c d-a.c d-bw.c d-f.c d-i.c d-u.c d2-c.c damdf.c 
	dauto.c dauto2.c dconv.c ddisp.c dfft.c dmod.c dpeak.c dstat.c 
	dwin.c f-d.c f-i.c fhor.c fhor2.c fhor3.c i-d.c i-f.c ihist.c 
	imod.c istat.c u-d.c u-f.c umod.c ustat.c 
Log Message:
more c89 embracing.  c89 provides string.h for all of the various str*() and mem*() functions, so remove the check for its presence.  there is still likely to be work required for strict c89 conformance for the various bsd strings.h functions that may be in use.


Index: a-d.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/a-d.c,v
retrieving revision 14.8
retrieving revision 14.9
diff -w -u -r14.8 -r14.9
--- a-d.c	20 Feb 2007 08:19:50 -0000	14.8
+++ a-d.c	15 Sep 2007 16:23:20 -0000	14.9
@@ -29,11 +29,7 @@
 #include <math.h>
 #include <ctype.h>
 #include <unistd.h>
-#ifdef HAVE_STRING_H
 #  include <string.h>
-#else
-#  include <strings.h>
-#endif
 
 #include "machine.h"
 #include "bu.h"

Index: bw-d.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/bw-d.c,v
retrieving revision 14.8
retrieving revision 14.9
diff -w -u -r14.8 -r14.9
--- bw-d.c	23 Jan 2007 01:13:47 -0000	14.8
+++ bw-d.c	15 Sep 2007 16:23:20 -0000	14.9
@@ -30,13 +30,10 @@
 #include "common.h"
 
 #include <stdlib.h> /* for atof() */
-#ifdef HAVE_STRING_H
 #  include <string.h>
-#else
-#  include <strings.h>
-#endif
 #include <stdio.h>
 #include <math.h>
+
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif

Index: d-a.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/d-a.c,v
retrieving revision 14.6
retrieving revision 14.7
diff -w -u -r14.6 -r14.7
--- d-a.c	23 Jan 2007 01:13:47 -0000	14.6
+++ d-a.c	15 Sep 2007 16:23:20 -0000	14.7
@@ -24,12 +24,7 @@
 
 #include "common.h"
 
-#ifdef HAVE_STRING_H
 #  include <string.h>
-#else
-#  include <strings.h>
-#endif
-
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>

Index: d-bw.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/d-bw.c,v
retrieving revision 14.8
retrieving revision 14.9
diff -w -u -r14.8 -r14.9
--- d-bw.c	23 Jan 2007 01:13:47 -0000	14.8
+++ d-bw.c	15 Sep 2007 16:23:20 -0000	14.9
@@ -31,11 +31,8 @@
 #include "common.h"
 
 #include <stdlib.h>
-#ifdef HAVE_STRING_H
 #  include <string.h>
-#else
-#  include <strings.h>
-#endif
+
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif

Index: d-f.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/d-f.c,v
retrieving revision 14.9
retrieving revision 14.10
diff -w -u -r14.9 -r14.10
--- d-f.c	14 Sep 2007 20:06:50 -0000	14.9
+++ d-f.c	15 Sep 2007 16:23:20 -0000	14.10
@@ -31,19 +31,14 @@
 #include "common.h"
 
 #include <stdlib.h>
-#ifdef HAVE_STRING_H
 #  include <string.h>
-#else
-#  include <strings.h>
-#endif
+#include <stdio.h>
+#include <math.h>
+
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-
 #include "machine.h"
 
 double	ibuf[512] = { 0.0 };

Index: d-i.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/d-i.c,v
retrieving revision 14.8
retrieving revision 14.9
diff -w -u -r14.8 -r14.9
--- d-i.c	23 Jan 2007 01:13:47 -0000	14.8
+++ d-i.c	15 Sep 2007 16:23:20 -0000	14.9
@@ -32,12 +32,9 @@
 
 #include <stdlib.h> /* for atof() */
 #include <stdio.h>
-#ifdef HAVE_STRING_H
 #  include <string.h>
-#else
-#  include <strings.h>
-#endif
 #include <math.h>
+
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif

Index: d-u.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/d-u.c,v
retrieving revision 14.8
retrieving revision 14.9
diff -w -u -r14.8 -r14.9
--- d-u.c	23 Jan 2007 01:13:47 -0000	14.8
+++ d-u.c	15 Sep 2007 16:23:21 -0000	14.9
@@ -33,11 +33,8 @@
 
 #include <stdio.h>
 #include <stdlib.h> /* for atof() */
-#ifdef HAVE_STRING_H
 #  include <string.h>
-#else
-#  include <strings.h>
-#endif
+
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif

Index: d2-c.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/d2-c.c,v
retrieving revision 14.7
retrieving revision 14.8
diff -w -u -r14.7 -r14.8
--- d2-c.c	27 Jan 2007 01:41:45 -0000	14.7
+++ d2-c.c	15 Sep 2007 16:23:21 -0000	14.8
@@ -30,14 +30,9 @@
 
 #include "common.h"
 
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include <stdio.h>
+
 #include "machine.h"
 
 double	obuf[2*1024];

Index: damdf.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/damdf.c,v
retrieving revision 14.7
retrieving revision 14.8
diff -w -u -r14.7 -r14.8
--- damdf.c	27 Jan 2007 01:41:45 -0000	14.7
+++ damdf.c	15 Sep 2007 16:23:21 -0000	14.8
@@ -24,17 +24,12 @@
  */
 #include "common.h"
 
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <math.h>
+
 #include "machine.h"
 
 #define	BSIZE	2048		/* Must be AT LEAST 2*Points in spectrum */

Index: dauto.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/dauto.c,v
retrieving revision 14.7
retrieving revision 14.8
diff -w -u -r14.7 -r14.8
--- dauto.c	23 Jan 2007 01:13:47 -0000	14.7
+++ dauto.c	15 Sep 2007 16:23:21 -0000	14.8
@@ -30,14 +30,11 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
+#include <string.h>
+
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
-#ifdef HAVE_STRING_H
-#  include <string.h>
-#else
-#  include <strings.h>
-#endif
 
 #include "machine.h"
 #include "bu.h"

Index: dauto2.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/dauto2.c,v
retrieving revision 14.7
retrieving revision 14.8
diff -w -u -r14.7 -r14.8
--- dauto2.c	27 Jan 2007 01:41:45 -0000	14.7
+++ dauto2.c	15 Sep 2007 16:23:21 -0000	14.8
@@ -25,16 +25,12 @@
 #include "common.h"
 
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <math.h>
+
 #include "machine.h"
 
 #define	BSIZE	2048		/* Must be AT LEAST 2*Points in spectrum */

Index: dconv.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/dconv.c,v
retrieving revision 14.7
retrieving revision 14.8
diff -w -u -r14.7 -r14.8
--- dconv.c	27 Jan 2007 01:41:45 -0000	14.7
+++ dconv.c	15 Sep 2007 16:23:21 -0000	14.8
@@ -31,17 +31,12 @@
  */
 #include "common.h"
 
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
+
 #include "machine.h"
 
 #define	MAXM	4096

Index: ddisp.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/ddisp.c,v
retrieving revision 14.8
retrieving revision 14.9
diff -w -u -r14.8 -r14.9
--- ddisp.c	27 Jan 2007 01:41:45 -0000	14.8
+++ ddisp.c	15 Sep 2007 16:23:21 -0000	14.9
@@ -23,16 +23,11 @@
  */
 #include "common.h"
 
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
+
 #include "machine.h"
 #include "fb.h"
 

Index: dfft.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/dfft.c,v
retrieving revision 14.11
retrieving revision 14.12
diff -w -u -r14.11 -r14.12
--- dfft.c	14 Sep 2007 15:22:05 -0000	14.11
+++ dfft.c	15 Sep 2007 16:23:21 -0000	14.12
@@ -26,15 +26,10 @@
  */
 #include "common.h"
 
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
-#ifdef HAVE_STRING_H
 #  include <string.h>
-#else
-#  include <strings.h>
-#endif
 #include <math.h>
 
 #include "machine.h"

Index: dmod.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/dmod.c,v
retrieving revision 14.10
retrieving revision 14.11
diff -w -u -r14.10 -r14.11
--- dmod.c	2 Feb 2007 08:48:30 -0000	14.10
+++ dmod.c	15 Sep 2007 16:23:21 -0000	14.11
@@ -33,14 +33,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
+#include <string.h>
+
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
-#ifdef HAVE_STRING_H
-#  include <string.h>
-#else
-#  include <strings.h>
-#endif
 
 #include "machine.h"
 #include "bu.h"

Index: dpeak.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/dpeak.c,v
retrieving revision 14.7
retrieving revision 14.8
diff -w -u -r14.7 -r14.8
--- dpeak.c	27 Jan 2007 01:41:45 -0000	14.7
+++ dpeak.c	15 Sep 2007 16:23:21 -0000	14.8
@@ -24,17 +24,12 @@
  */
 #include "common.h"
 
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <math.h>
+
 #include "machine.h"
 
 #define	BSIZE	2048		/* Must be AT LEAST 2*Points in spectrum */

Index: dstat.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/dstat.c,v
retrieving revision 14.9
retrieving revision 14.10
diff -w -u -r14.9 -r14.10
--- dstat.c	26 Jul 2007 01:13:59 -0000	14.9
+++ dstat.c	15 Sep 2007 16:23:21 -0000	14.10
@@ -29,12 +29,7 @@
  */
 #include "common.h"
 
-#ifdef HAVE_STRING_H
 #  include <string.h>
-#else
-#  include <strings.h>
-#endif
-
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>

Index: dwin.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/dwin.c,v
retrieving revision 14.8
retrieving revision 14.9
diff -w -u -r14.8 -r14.9
--- dwin.c	23 Jan 2007 01:13:47 -0000	14.8
+++ dwin.c	15 Sep 2007 16:23:21 -0000	14.9
@@ -24,14 +24,11 @@
  */
 #include "common.h"
 
-#ifdef HAVE_STRING_H
 #  include <string.h>
-#else
-#  include <strings.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h> /* for atof() */
 #include <math.h>
+
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif

Index: f-d.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/f-d.c,v
retrieving revision 14.8
retrieving revision 14.9
diff -w -u -r14.8 -r14.9
--- f-d.c	23 Jan 2007 01:13:47 -0000	14.8
+++ f-d.c	15 Sep 2007 16:23:21 -0000	14.9
@@ -34,11 +34,8 @@
 #include <stdio.h>
 #include <math.h>
 
-#ifdef HAVE_STRING_H
 #  include <string.h>
-#else
-#  include <strings.h>
-#endif
+
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif

Index: f-i.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/f-i.c,v
retrieving revision 14.8
retrieving revision 14.9
diff -w -u -r14.8 -r14.9
--- f-i.c	23 Jan 2007 01:13:47 -0000	14.8
+++ f-i.c	15 Sep 2007 16:23:21 -0000	14.9
@@ -33,11 +33,8 @@
 #include <stdlib.h> /* for atof() */
 #include <stdio.h>
 #include <math.h>
-#ifdef HAVE_STRING_H
 #  include <string.h>
-#else
-#  include <strings.h>
-#endif
+
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif

Index: fhor.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/fhor.c,v
retrieving revision 14.7
retrieving revision 14.8
diff -w -u -r14.7 -r14.8
--- fhor.c	27 Jan 2007 01:41:45 -0000	14.7
+++ fhor.c	15 Sep 2007 16:23:21 -0000	14.8
@@ -27,17 +27,12 @@
  */
 #include "common.h"
 
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <math.h>		/* XXX - temp debug */
+
 #include "machine.h"
 #include "fb.h"
 

Index: fhor2.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/fhor2.c,v
retrieving revision 14.7
retrieving revision 14.8
diff -w -u -r14.7 -r14.8
--- fhor2.c	23 Jan 2007 01:13:47 -0000	14.7
+++ fhor2.c	15 Sep 2007 16:23:21 -0000	14.8
@@ -25,12 +25,7 @@
  */
 #include "common.h"
 
-#ifdef HAVE_STRING_H
 #  include <string.h>
-#else
-#  include <strings.h>
-#endif
-
 #include <stdio.h>
 #include <math.h>		/* XXX - temp debug */
 

Index: fhor3.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/fhor3.c,v
retrieving revision 14.7
retrieving revision 14.8
diff -w -u -r14.7 -r14.8
--- fhor3.c	27 Jan 2007 01:41:45 -0000	14.7
+++ fhor3.c	15 Sep 2007 16:23:21 -0000	14.8
@@ -28,15 +28,10 @@
  */
 #include "common.h"
 
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include <stdio.h>
 #include <math.h>		/* XXX - temp debug */
+
 #include "machine.h"
 #include "fb.h"
 

Index: i-d.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/i-d.c,v
retrieving revision 14.8
retrieving revision 14.9
diff -w -u -r14.8 -r14.9
--- i-d.c	23 Jan 2007 01:13:47 -0000	14.8
+++ i-d.c	15 Sep 2007 16:23:21 -0000	14.9
@@ -29,15 +29,11 @@
  */
 #include "common.h"
 
-
 #include <stdlib.h> /* for atof() */
 #include <stdio.h>
 #include <math.h>
-#ifdef HAVE_STRING_H
 #  include <string.h>
-#else
-#  include <strings.h>
-#endif
+
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif

Index: i-f.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/i-f.c,v
retrieving revision 14.8
retrieving revision 14.9
diff -w -u -r14.8 -r14.9
--- i-f.c	23 Jan 2007 01:13:47 -0000	14.8
+++ i-f.c	15 Sep 2007 16:23:21 -0000	14.9
@@ -32,11 +32,8 @@
 #include <stdlib.h> /* for atof() */
 #include <stdio.h>
 #include <math.h>
-#ifdef HAVE_STRING_H
 #  include <string.h>
-#else
-#  include <strings.h>
-#endif
+
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif

Index: ihist.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/ihist.c,v
retrieving revision 14.8
retrieving revision 14.9
diff -w -u -r14.8 -r14.9
--- ihist.c	27 Jan 2007 01:41:45 -0000	14.8
+++ ihist.c	15 Sep 2007 16:23:22 -0000	14.9
@@ -23,13 +23,7 @@
 
 #include "common.h"
 
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>

Index: imod.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/imod.c,v
retrieving revision 14.12
retrieving revision 14.13
diff -w -u -r14.12 -r14.13
--- imod.c	29 Aug 2007 18:33:24 -0000	14.12
+++ imod.c	15 Sep 2007 16:23:22 -0000	14.13
@@ -38,15 +38,12 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
+#include <math.h>
+
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
-#ifdef HAVE_STRING_H
-#  include <string.h>
-#else
-#  include <strings.h>
-#endif
-#include <math.h>
 
 #include "machine.h"
 #include "bu.h"

Index: istat.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/istat.c,v
retrieving revision 14.9
retrieving revision 14.10
diff -w -u -r14.9 -r14.10
--- istat.c	2 Feb 2007 08:48:30 -0000	14.9
+++ istat.c	15 Sep 2007 16:23:22 -0000	14.10
@@ -29,14 +29,11 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
+
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
-#ifdef HAVE_STRING_H
-#  include <string.h>
-#else
-#  include <strings.h>
-#endif
 
 #include "machine.h"
 #include "bu.h"

Index: u-d.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/u-d.c,v
retrieving revision 14.8
retrieving revision 14.9
diff -w -u -r14.8 -r14.9
--- u-d.c	23 Jan 2007 01:13:47 -0000	14.8
+++ u-d.c	15 Sep 2007 16:23:22 -0000	14.9
@@ -32,11 +32,8 @@
 #include <stdlib.h> /* for atof() */
 #include <stdio.h>
 #include <math.h>
-#ifdef HAVE_STRING_H
 #  include <string.h>
-#else
-#  include <strings.h>
-#endif
+
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif

Index: u-f.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/u-f.c,v
retrieving revision 14.8
retrieving revision 14.9
diff -w -u -r14.8 -r14.9
--- u-f.c	23 Jan 2007 01:13:47 -0000	14.8
+++ u-f.c	15 Sep 2007 16:23:22 -0000	14.9
@@ -33,11 +33,8 @@
 #include <stdlib.h> /* for atof() */
 #include <stdio.h>
 #include <math.h>
-#ifdef HAVE_STRING_H
 #  include <string.h>
-#else
-#  include <strings.h>
-#endif
+
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif

Index: umod.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/umod.c,v
retrieving revision 14.11
retrieving revision 14.12
diff -w -u -r14.11 -r14.12
--- umod.c	26 Jul 2007 01:13:59 -0000	14.11
+++ umod.c	15 Sep 2007 16:23:22 -0000	14.12
@@ -40,14 +40,11 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
+#include <string.h>
+
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
-#ifdef HAVE_STRING_H
-#  include <string.h>
-#else
-#  include <strings.h>
-#endif
 
 #include "machine.h"
 #include "bu.h"

Index: ustat.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/ustat.c,v
retrieving revision 14.9
retrieving revision 14.10
diff -w -u -r14.9 -r14.10
--- ustat.c	2 Feb 2007 08:48:30 -0000	14.9
+++ ustat.c	15 Sep 2007 16:23:22 -0000	14.10
@@ -28,14 +28,11 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
+
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
-#ifdef HAVE_STRING_H
-#  include <string.h>
-#else
-#  include <strings.h>
-#endif
 
 #include "machine.h"
 #include "bu.h"