[src/trunk]: src/external/bsd/bind/dist/lib/dns handle openssl versions less ...

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

details:   https://anonhg.NetBSD.org/src/rev/8d718b76548c
branches:  trunk
changeset: 759679:8d718b76548c
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Dec 14 23:16:39 2010 +0000

description:
handle openssl versions less < 1.

diffstat:

 external/bsd/bind/dist/lib/dns/openssl_link.c |  8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diffs (31 lines):

diff -r a566ef905e97 -r 8d718b76548c external/bsd/bind/dist/lib/dns/openssl_link.c
--- a/external/bsd/bind/dist/lib/dns/openssl_link.c     Tue Dec 14 21:49:21 2010 +0000
+++ b/external/bsd/bind/dist/lib/dns/openssl_link.c     Tue Dec 14 23:16:39 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: openssl_link.c,v 1.2 2009/12/27 17:27:29 christos Exp $        */
+/*     $NetBSD: openssl_link.c,v 1.3 2010/12/14 23:16:39 christos Exp $        */
 
 /*
  * Portions Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
@@ -98,7 +98,11 @@
        return (result == ISC_R_SUCCESS ? num : -1);
 }
 
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
+static void
+#else
 static int
+#endif
 entropy_add(const void *buf, int num, double entropy) {
        /*
         * Do nothing.  The only call to this provides no useful data anyway.
@@ -106,7 +110,9 @@
        UNUSED(buf);
        UNUSED(num);
        UNUSED(entropy);
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
        return 0;
+#endif
 }
 
 static void