diff options
author | Colin Watson <cjwatson@debian.org> | 2004-03-01 02:25:32 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2004-03-01 02:25:32 +0000 |
commit | ea8116a11e3de70036dbc665ccb0d486cf89cac9 (patch) | |
tree | d73ccdff78d8608e156465af42e6a1b3527fb2d6 /uuencode.h | |
parent | e39b311381a5609cc05acf298c42fba196dc524b (diff) | |
parent | f5bda272678ec6dccaa5f29379cf60cb855018e8 (diff) |
Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it
extensively yet.
ProtocolKeepAlives is now just a compatibility alias for
ServerAliveInterval.
Diffstat (limited to 'uuencode.h')
-rw-r--r-- | uuencode.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/uuencode.h b/uuencode.h index 682b623ac..08e87c4bc 100644 --- a/uuencode.h +++ b/uuencode.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: uuencode.h,v 1.9 2002/02/25 16:33:27 markus Exp $ */ | 1 | /* $OpenBSD: uuencode.h,v 1.10 2003/11/10 16:23:41 jakob Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | #ifndef UUENCODE_H | 27 | #ifndef UUENCODE_H |
28 | #define UUENCODE_H | 28 | #define UUENCODE_H |
29 | int uuencode(u_char *, u_int, char *, size_t); | 29 | int uuencode(const u_char *, u_int, char *, size_t); |
30 | int uudecode(const char *, u_char *, size_t); | 30 | int uudecode(const char *, u_char *, size_t); |
31 | void dump_base64(FILE *, u_char *, u_int); | 31 | void dump_base64(FILE *, u_char *, u_int); |
32 | #endif | 32 | #endif |