commit 75edac3366133f83d10ad8c560db7d28e48305f3
author Damien Miller <djm@mindrot.org> Tue May 09 15:28:41 2000 +1000
committer Damien Miller <djm@mindrot.org> Tue May 09 15:28:41 2000 +1000
tree b6317fd727d1df4bc4e0a63780228ffd09fc3166
parent 2a44f8938d5ea02aa622bc3106988db26d9d74d6

 - Cleanup of bsd-base64 headers, bugfix definitions of __b64_*. Reported
   by Andre Lucas <andre.lucas@dial.pipex.com>

bsd-base64.c

diff --git a/bsd-base64.c b/bsd-base64.c
index 57a9573..8cbf8ee 100644
--- a/bsd-base64.c
+++ b/bsd-base64.c
@@ -44,7 +44,7 @@
 
 #include "config.h"
 
-#ifndef HAVE_B64_NTOP
+#if !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP)
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -53,12 +53,13 @@
 #include <arpa/inet.h>
 
 #include <ctype.h>
-#include <resolv.h>
 #include <stdio.h>
 
 #include <stdlib.h>
 #include <string.h>
 
+#include "bsd-base64.h"
+
 #define Assert(Cond) if (!(Cond)) abort()
 
 static const char Base64[] =
@@ -312,4 +313,4 @@
 	return (tarindex);
 }
 
-#endif /* HAVE_B64_NTOP */
+#endif /* !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP) */