Script to turn plain man pages into html now that we want to make html man

[gssapi-openssh.git] / openssh / openbsd-compat / base64.c

diff --git a/openssh/openbsd-compat/base64.c b/openssh/openbsd-compat/base64.c
index 91a5ab0ed8248774093cb3162017a0adba5a516b..d12b993b7cab3e188344b1ad31729b3773771432 100644 (file)
--- a/openssh/openbsd-compat/base64.c
+++ b/openssh/openbsd-compat/base64.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: base64.c,v 1.4 2002/01/02 23:00:10 deraadt Exp $      */
+/*     $OpenBSD: base64.c,v 1.3 1997/11/08 20:46:55 deraadt Exp $      */
 
 /*
  * Copyright (c) 1996 by Internet Software Consortium.
@@ -42,9 +42,9 @@
  * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#include "includes.h"
+#include "config.h"
 
-#if (!defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP)) || (!defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON))
+#if !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP)
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -60,7 +60,6 @@
 
 #include "base64.h"
 
-/* XXX abort illegal in library */
 #define Assert(Cond) if (!(Cond)) abort()
 
 static const char Base64[] =
@@ -130,7 +129,6 @@ 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)
 {
@@ -191,9 +189,6 @@ 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)
@@ -318,5 +313,4 @@ b64_pton(char const *src, u_char *target, size_t targsize)
        return (tarindex);
 }
 
-#endif /* !defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON) */
-#endif 
+#endif /* !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP) */