- Cleanup of bsd-base64 headers, bugfix definitions of __b64_*. Reported
by Andre Lucas <andre.lucas@dial.pipex.com>
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) */