[src/trunk]: src/include/heimdal avoid redundant declarations.

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

details:   https://anonhg.NetBSD.org/src/rev/808a6da0054f
branches:  trunk
changeset: 503295:808a6da0054f
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Feb 04 18:05:00 2001 +0000

description:
avoid redundant declarations.

diffstat:

 include/heimdal/roken.h   |  6 +++++-
 include/heimdal/version.h |  6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (52 lines):

diff -r c8b70cb6b628 -r 808a6da0054f include/heimdal/roken.h
--- a/include/heimdal/roken.h   Sun Feb 04 18:04:03 2001 +0000
+++ b/include/heimdal/roken.h   Sun Feb 04 18:05:00 2001 +0000
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: roken.h,v 1.2 2000/08/03 03:54:21 assar Exp $ */
+/* $Id: roken.h,v 1.3 2001/02/04 18:05:00 christos Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -122,7 +122,9 @@
 
 
 
+#ifndef BSD4_4
 int mkstemp(char *);
+#endif
 
 
 
@@ -173,8 +175,10 @@
 struct hostent *
 getipnodebyaddr (const void *src, size_t len, int af, int *error_num);
 
+#ifndef BSD4_4
 void
 freehostent (struct hostent *h);
+#endif
 
 struct hostent *
 copyhostent (const struct hostent *h);
diff -r c8b70cb6b628 -r 808a6da0054f include/heimdal/version.h
--- a/include/heimdal/version.h Sun Feb 04 18:04:03 2001 +0000
+++ b/include/heimdal/version.h Sun Feb 04 18:05:00 2001 +0000
@@ -1,12 +1,12 @@
-/*     $NetBSD: version.h,v 1.6 2000/12/30 22:30:01 assar Exp $        */
+/*     $NetBSD: version.h,v 1.7 2001/02/04 18:05:01 christos Exp $     */
 
-#ifdef __KRB5_VERSION
+#if defined(__KRB5_VERSION) && !defined(__NO_KRB4_VERSION)
 #define        heimdal_long_version    __heimdal_long_version
 #define        heimdal_version         __heimdal_version
 #define        __NO_KRB4_VERSION
 #endif
 
-#ifdef __KRB4_VERSION
+#if defined(__KRB4_VERSION) && !defined(__NO_KRB5_VERSION)
 #define        krb4_long_version       __krb4_long_version
 #define        krb4_version            __krb4_version
 #define        __NO_KRB5_VERSION