[src/trunk]: src/bin/dd Blah, oversight. Revert previous; clean up to proper...

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2a0a662899f3
branches:  trunk
changeset: 521372:2a0a662899f3
user:      tv <tv%NetBSD.org@localhost>
date:      Tue Jan 29 10:53:39 2002 +0000

description:
Blah, oversight.  Revert previous; clean up to proper syntax, and add
conditional for <err.h>.

diffstat:

 bin/dd/strsuftoull.c |  15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 292f1ebdb87c -r 2a0a662899f3 bin/dd/strsuftoull.c
--- a/bin/dd/strsuftoull.c      Tue Jan 29 10:51:45 2002 +0000
+++ b/bin/dd/strsuftoull.c      Tue Jan 29 10:53:39 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: strsuftoull.c,v 1.5 2002/01/29 10:51:45 tv Exp $       */
+/*     $NetBSD: strsuftoull.c,v 1.6 2002/01/29 10:53:39 tv Exp $       */
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -75,20 +75,29 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: strsuftoull.c,v 1.5 2002/01/29 10:51:45 tv Exp $");
+__RCSID("$NetBSD: strsuftoull.c,v 1.6 2002/01/29 10:53:39 tv Exp $");
 #endif /* not lint */
 
+#if HAVE_CONFIG_H
+#include "config.h"
+#else
+#define HAVE_ERR_H 1
+#endif
+
 #include <sys/types.h>
 #include <sys/time.h>
 
 #include <assert.h>
-#include <err.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#if HAVE_ERR_H
+#include <err.h>
+#endif
+
 #include "strsuftoull.h"