diff options
| author | wiz <wiz@NetBSD.org> | 2002-05-26 16:53:30 +0000 |
|---|---|---|
| committer | wiz <wiz@NetBSD.org> | 2002-05-26 16:53:30 +0000 |
| commit | 143cf52f816688c8d023c5b9c414f4eaaa48ce41 (patch) | |
| tree | 1bb8cc565cf51c5154bc1f38b365db8d24b593b0 /lib/libkstream | |
| parent | 738d04eceea0a2a1ee9416606206f3d66ed21960 (diff) | |
__STDC__ is always defined on NetBSD.
Diffstat (limited to 'lib/libkstream')
| -rw-r--r-- | lib/libkstream/kstream.c | 13 | ||||
| -rw-r--r-- | lib/libkstream/kstream.h | 22 |
2 files changed, 2 insertions, 33 deletions
diff --git a/lib/libkstream/kstream.c b/lib/libkstream/kstream.c index bbbdb5842bb..9889ec47ce1 100644 --- a/lib/libkstream/kstream.c +++ b/lib/libkstream/kstream.c @@ -1,4 +1,4 @@ -/* $NetBSD: kstream.c,v 1.3 2001/11/05 15:01:02 lukem Exp $ */ +/* $NetBSD: kstream.c,v 1.4 2002/05/26 17:04:44 wiz Exp $ */ /* Encrypted-stream implementation for MIT Kerberos. Written by Ken Raeburn (Raeburn@Cygnus.COM). @@ -53,19 +53,8 @@ #endif #include <kerberosIV/kstream.h> -#ifdef __STDC__ int krb_net_write (int, char *, int); int krb_net_read (int, char *, int); -#else -int krb_net_write (); -int krb_net_read (); -void abort (); -char *memmove (); -void *memcpy (); -char *malloc (); -char *realloc (); -void free (); -#endif #ifdef sun #ifndef solaris20 diff --git a/lib/libkstream/kstream.h b/lib/libkstream/kstream.h index 5b6126331a0..1ace67f2f72 100644 --- a/lib/libkstream/kstream.h +++ b/lib/libkstream/kstream.h @@ -6,7 +6,7 @@ For copying and distribution information, please see the file <mit-copyright.h>. - $NetBSD: kstream.h,v 1.1.1.1 2000/06/17 06:24:28 thorpej Exp $ + $NetBSD: kstream.h,v 1.2 2002/05/26 17:04:44 wiz Exp $ */ #include <sys/types.h> /* for size_t */ @@ -15,11 +15,7 @@ requested, output will be flushed before input is read, or when kstream_flush is called. */ -#if defined (__STDC__) || defined (__cplusplus) typedef void *kstream_ptr; -#else -typedef char *kstream_ptr; -#endif typedef struct kstream_rec *kstream; struct kstream_data_block { kstream_ptr ptr; @@ -31,7 +27,6 @@ struct kstream_crypt_ctl_block { Right now, it's just a hack so we can bang out the interface in some form that lets us run both rcp and rlogin. This is also the only reason the contents of this structure are public. */ -#if defined (__STDC__) || defined (__cplusplus) int (*encrypt) (struct kstream_data_block *, /* output -- written */ struct kstream_data_block*, /* input */ kstream str @@ -42,14 +37,9 @@ struct kstream_crypt_ctl_block { ); /* ret val = # input bytes used */ int (*init) (kstream str, kstream_ptr data); void (*destroy) (kstream str); -#else - int (*encrypt) (), (*decrypt) (), (*init) (); - void (*destroy) (); -#endif }; /* ctl==0 means no encryption. data is specific to crypt functions */ -#if defined (__STDC__) || defined (__cplusplus) kstream kstream_create_from_fd (int fd, const struct kstream_crypt_ctl_block *ctl, kstream_ptr data); @@ -64,21 +54,11 @@ int kstream_read (kstream, void*, size_t); int kstream_flush (kstream); int kstream_destroy (kstream); void kstream_set_buffer_mode (kstream, int); -#else -kstream kstream_create_from_fd (), - kstream_create_rlogin_from_fd (), - kstream_create_rcp_from_fd (); -void kstream_set_buffer_mode (); -#endif #if 0 /* Perhaps someday... */ kstream kstream_create (principal, host, port, ...); #endif -#if !defined (__STDC__) && !defined (__cplusplus) && !defined (const) -#define const /* empty */ -#endif - typedef struct fifo { char data[10*1024]; size_t next_write, next_read; |
