summaryrefslogtreecommitdiffstats
path: root/bsd-base64.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-05-09 15:28:41 +1000
committerDamien Miller <djm@mindrot.org>2000-05-09 15:28:41 +1000
commit75edac3366133f83d10ad8c560db7d28e48305f3 (patch)
treeb6317fd727d1df4bc4e0a63780228ffd09fc3166 /bsd-base64.c
parent2a44f8938d5ea02aa622bc3106988db26d9d74d6 (diff)
- Cleanup of bsd-base64 headers, bugfix definitions of __b64_*. Reported
by Andre Lucas <andre.lucas@dial.pipex.com>
Diffstat (limited to 'bsd-base64.c')
-rw-r--r--bsd-base64.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/bsd-base64.c b/bsd-base64.c
index 57a95736..8cbf8eee 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 @@ b64_pton(char const *src, u_char *target, size_t targsize)
return (tarindex);
}
-#endif /* HAVE_B64_NTOP */
+#endif /* !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP) */