diff options
author | Damien Miller <djm@mindrot.org> | 2000-05-09 15:28:41 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-05-09 15:28:41 +1000 |
commit | 75edac3366133f83d10ad8c560db7d28e48305f3 (patch) | |
tree | b6317fd727d1df4bc4e0a63780228ffd09fc3166 | |
parent | 2a44f8938d5ea02aa622bc3106988db26d9d74d6 (diff) |
- Cleanup of bsd-base64 headers, bugfix definitions of __b64_*. Reported
by Andre Lucas <andre.lucas@dial.pipex.com>
-rw-r--r-- | bsd-base64.c | 7 | ||||
-rw-r--r-- | bsd-base64.h | 11 | ||||
-rw-r--r-- | uuencode.c | 2 |
3 files changed, 8 insertions, 12 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) */ diff --git a/bsd-base64.h b/bsd-base64.h index c5dace7c..c1d69dd6 100644 --- a/bsd-base64.h +++ b/bsd-base64.h @@ -4,16 +4,13 @@ #include "config.h" #ifndef HAVE___B64_NTOP -# ifdef HAVE_B64_NTOP -# define __b64_ntop b64_ntop -# define __b64_pton b64_pton -# else /* !HAVE_B64_NTOP */ - +# ifndef HAVE_B64_NTOP int b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize); int b64_pton(char const *src, u_char *target, size_t targsize); - -# endif /* HAVE_B64_NTOP */ +# endif /* !HAVE_B64_NTOP */ +# define __b64_ntop b64_ntop +# define __b64_pton b64_pton #endif /* HAVE___B64_NTOP */ #endif /* _BSD_BINRESVPORT_H */ @@ -4,8 +4,6 @@ #include "includes.h" #include "xmalloc.h" -#include <resolv.h> - int uuencode(unsigned char *src, unsigned int srclength, char *target, size_t targsize) |