diff options
| author | Keith Vetter <keithv@fusion.com> | 1995-09-28 08:22:34 +0000 |
|---|---|---|
| committer | Keith Vetter <keithv@fusion.com> | 1995-09-28 08:22:34 +0000 |
| commit | f11458f54ce37f436b1deedf68d683466afa33cc (patch) | |
| tree | ca773f55e656e920a32f8934b400da1ed5cbe8a7 /src/include | |
| parent | 9f3d80f60e0ede10438f160a1e0973b11b49a849 (diff) | |
| download | krb5-f11458f54ce37f436b1deedf68d683466afa33cc.tar.gz krb5-f11458f54ce37f436b1deedf68d683466afa33cc.tar.xz krb5-f11458f54ce37f436b1deedf68d683466afa33cc.zip | |
Working telnet authentication module and project consolidations
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6878 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/k5-int.h | 22 | ||||
| -rw-r--r-- | src/include/krb5.hin | 26 | ||||
| -rw-r--r-- | src/include/krb5/ChangeLog | 5 | ||||
| -rw-r--r-- | src/include/krb5/adm_proto.h | 2 | ||||
| -rw-r--r-- | src/include/krb5/macsock.h | 2 |
5 files changed, 53 insertions, 4 deletions
diff --git a/src/include/k5-int.h b/src/include/k5-int.h index cb70dec60..314f618f3 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -177,8 +177,28 @@ int sscanf(const char *str, char const *fmt0, ...); #else /* Rest of include file is for non-Microloss-Windows */ +#ifndef _MACINTOSH +#if defined(__MWERKS__) || defined(applec) || defined(THINK_C) +#define _MACINTOSH +#define SIZEOF_INT 4 +#define SIZEOF_SHORT 2 +#define HAVE_SRAND +#define NO_PASSWORD +#define HAS_LABS +#define ENOMEM -1 +#define ANSI_STDIO +#ifndef _SIZET +typedef unsigned int size_t; +#define _SIZET +#endif +#include <unix.h> +#include <ctype.h> +#endif +#endif + #if defined(_MACINTOSH) + #ifdef NEED_LOWLEVEL_IO #include <fcntl.h> #endif @@ -191,7 +211,7 @@ typedef short nlink_t; typedef unsigned long uid_t; typedef unsigned long gid_t; typedef long off_t; -#ifndef _MWERKS +#ifndef __MWERKS__ struct stat { mode_t st_mode; /* File mode; see #define's below */ diff --git a/src/include/krb5.hin b/src/include/krb5.hin index 4999d4475..cea5d34ef 100644 --- a/src/include/krb5.hin +++ b/src/include/krb5.hin @@ -63,12 +63,36 @@ typedef unsigned char u_char; #define FAR #define NEAR #endif /* !KRB5_CONFIG__ */ -#ifndef _MACINTOSH +#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif #endif /* _MSDOS */ /* + * figure if we're on a macintosh + */ + +#if defined(__MWERKS__) || defined(applec) || defined(THINK_C) +#define _MACINTOSH +#endif + +#ifdef _MACINTOSH +#define SIZEOF_INT 4 +#define SIZEOF_SHORT 2 +#define HAVE_SRAND +#define NO_PASSWORD +#define HAS_LABS +#define ENOMEM -1 +#define ANSI_STDIO +#ifndef _SIZET +typedef unsigned int size_t; +#define _SIZET +#endif +#include <unix.h> +#include <ctype.h> +#endif /* _MACINTOSH */ + +/* * begin wordsize.h */ diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog index c7753c321..2278193d5 100644 --- a/src/include/krb5/ChangeLog +++ b/src/include/krb5/ChangeLog @@ -1,3 +1,8 @@ +Wed Sep 27 16:00:00 1995 John Rivlin <jrivlin@fusion.com> + + * adm_proto.h: Removed use of prototypes using krb5_db_entry + on the Macintosh. + Tue Sep 26 15:36:20 1995 <tytso@rsts-11.mit.edu> * kdb.h, kdb_dbm.h: Add #if !defined(_MSDOS) && diff --git a/src/include/krb5/adm_proto.h b/src/include/krb5/adm_proto.h index 64b10c46c..1cc2c0246 100644 --- a/src/include/krb5/adm_proto.h +++ b/src/include/krb5/adm_proto.h @@ -62,7 +62,7 @@ void INTERFACE krb5_adm_disconnect krb5_auth_context, krb5_ccache)); -#if ! defined(_WINDOWS) +#if ! defined(_WINDOWS) && ! defined(_MACINTOSH) /* adm_kw_dec.c */ krb5_error_code krb5_adm_proto_to_dbent KRB5_PROTOTYPE((krb5_context, diff --git a/src/include/krb5/macsock.h b/src/include/krb5/macsock.h index 1b8e30754..d320f2aa6 100644 --- a/src/include/krb5/macsock.h +++ b/src/include/krb5/macsock.h @@ -122,7 +122,7 @@ struct servent { char *s_proto; /* protocol to use */ }; -#ifndef _MWERKS +#ifndef __MWERKS__ /* Timeout values */ struct timeval { long tv_sec; /* Seconds */ |