summaryrefslogtreecommitdiff
path: root/openbsd-compat/base64.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-02-24 15:45:42 +1100
committerDamien Miller <djm@mindrot.org>2003-02-24 15:45:42 +1100
commitfe1f14375a6a739fa662b4a9d5e9744bff9716eb (patch)
tree55fffb9d77e432a4a07bcf62a0f941b3e3f8449b /openbsd-compat/base64.c
parent1a3ccb07c5709672d327afefd7fb6971e96b1ef7 (diff)
- (djm) Bug #456: Support for NEC SX6 with Unicos; from wendyp@cray.com
Diffstat (limited to 'openbsd-compat/base64.c')
-rw-r--r--openbsd-compat/base64.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/openbsd-compat/base64.c b/openbsd-compat/base64.c
index 005170b8..91a5ab0e 100644
--- a/openbsd-compat/base64.c
+++ b/openbsd-compat/base64.c
@@ -44,7 +44,7 @@
#include "includes.h"
-#if !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP)
+#if (!defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP)) || (!defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON))
#include <sys/types.h>
#include <sys/param.h>
@@ -130,6 +130,7 @@ static const char Pad64 = '=';
characters followed by one "=" padding character.
*/
+#if !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP)
int
b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize)
{
@@ -190,6 +191,9 @@ b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize)
target[datalength] = '\0'; /* Returned value doesn't count \0. */
return (datalength);
}
+#endif /* !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP) */
+
+#if !defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON)
/* skips all whitespace anywhere.
converts characters, four at a time, starting at (or after)
@@ -314,4 +318,5 @@ b64_pton(char const *src, u_char *target, size_t targsize)
return (tarindex);
}
-#endif /* !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP) */
+#endif /* !defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON) */
+#endif