diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/krb5/ChangeLog | 18 | ||||
| -rw-r--r-- | src/include/krb5/adm_proto.h | 14 | ||||
| -rw-r--r-- | src/include/krb5/kdb.h | 4 | ||||
| -rw-r--r-- | src/include/krb5/kdb_dbm.h | 4 | ||||
| -rw-r--r-- | src/include/krb5/kwinsock.h (renamed from src/include/krb5/winsock.h) | 0 |
5 files changed, 29 insertions, 11 deletions
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog index c7f7f61264..adc0fabd5a 100644 --- a/src/include/krb5/ChangeLog +++ b/src/include/krb5/ChangeLog @@ -1,3 +1,21 @@ +Wed Jun 12 00:40:29 1996 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * adm_proto.h: Change usage of INTERFACE to use KRB5_CALLCONV and + KRB5_DLLIMP. + +Mon Jun 10 17:31:29 1996 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * winsock.h: Rename to kwinsock.h. Recent versions of Microsoft + compilers include winsock.h, and the one we have collides + with NT errno definitions. Using the one provided by the + compiler is preferable. If you are using an old version + of MSVC that doesn't include winsock.h, then rename + kwinsock.h to winsock.h + + * kdb_dbm.h: Don't include kdb_dbm.h for Win-32. + + * kdb.h: Don't include most of kdb.h for Win-32. + Mon May 20 17:57:15 1996 Theodore Ts'o <tytso@rsts-11.mit.edu> * configure.in: Remove support for ODBM. diff --git a/src/include/krb5/adm_proto.h b/src/include/krb5/adm_proto.h index fa46fa618e..1097b3cba0 100644 --- a/src/include/krb5/adm_proto.h +++ b/src/include/krb5/adm_proto.h @@ -46,7 +46,7 @@ typedef struct ___krb5_key_salt_tuple krb5_key_salt_tuple; */ /* adm_conn.c */ -krb5_error_code INTERFACE krb5_adm_connect +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_adm_connect KRB5_PROTOTYPE((krb5_context, char *, char *, @@ -56,13 +56,13 @@ krb5_error_code INTERFACE krb5_adm_connect krb5_ccache *, char *, krb5_timestamp)); -void INTERFACE krb5_adm_disconnect +KRB5_DLLIMP void KRB5_CALLCONV krb5_adm_disconnect KRB5_PROTOTYPE((krb5_context, int *, krb5_auth_context, krb5_ccache)); -#if ! defined(_WINDOWS) && ! defined(_MACINTOSH) +#if !defined(_MSDOS) && !defined(_WIN32) && !defined(_MACINTOSH) /* adm_kw_dec.c */ krb5_error_code krb5_adm_proto_to_dbent KRB5_PROTOTYPE((krb5_context, @@ -80,7 +80,7 @@ krb5_error_code krb5_adm_dbent_to_proto char *, krb5_int32 *, krb5_data **)); -#endif /* _WINDOWS */ +#endif /* !(windows or macintosh) */ /* adm_kt_dec.c */ krb5_error_code krb5_adm_proto_to_ktent @@ -97,12 +97,12 @@ krb5_error_code krb5_adm_ktent_to_proto krb5_data **)); /* adm_rw.c */ -void INTERFACE krb5_free_adm_data +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_adm_data KRB5_PROTOTYPE((krb5_context, krb5_int32, krb5_data *)); -krb5_error_code INTERFACE krb5_send_adm_cmd +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_send_adm_cmd KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_auth_context, @@ -121,7 +121,7 @@ krb5_error_code krb5_read_adm_cmd krb5_auth_context, krb5_int32 *, krb5_data **)); -krb5_error_code INTERFACE krb5_read_adm_reply +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_read_adm_reply KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_auth_context, diff --git a/src/include/krb5/kdb.h b/src/include/krb5/kdb.h index 26b07b6657..7a8f5bb252 100644 --- a/src/include/krb5/kdb.h +++ b/src/include/krb5/kdb.h @@ -52,7 +52,7 @@ #define KRB5_KDB_SUPPORT_DESMD5 0x00004000 #define KRB5_KDB_NEW_PRINC 0x00008000 -#if !defined(_MACINTOSH) && !defined(_MSDOS) +#if !defined(_MACINTOSH) && !defined(_MSDOS) && !defined(_WIN32) /* * Note --- these structures cannot be modified without changing the @@ -425,5 +425,5 @@ krb5_error_code kdb5_db_set_dbops KRB5_PROTOTYPE((krb5_context, #else typedef struct _kdb5_dispatch_table kdb5_dispatch_table; #endif /* KDB5_DISPATCH */ -#endif /* !defined(_MACINTOSH) && !defined(_MSDOS) */ +#endif /* !defined(_MACINTOSH) && !defined(_MSDOS) &&!defined(_WIN32) */ #endif /* KRB5_KDB5__ */ diff --git a/src/include/krb5/kdb_dbm.h b/src/include/krb5/kdb_dbm.h index ea023a4843..970a934dc5 100644 --- a/src/include/krb5/kdb_dbm.h +++ b/src/include/krb5/kdb_dbm.h @@ -28,7 +28,7 @@ #ifndef KRB5_KDB5_DBM__ #define KRB5_KDB5_DBM__ -#if !defined(_MACINTOSH) && !defined(_MSDOS) +#if !defined(_MACINTOSH) && !defined(_MSDOS) && !defined(_WIN32) /* exclusive or shared lock flags */ #define KRB5_DBM_SHARED 0 @@ -111,5 +111,5 @@ krb5_error_code krb5_dbm_db_open_database krb5_error_code krb5_dbm_db_close_database KRB5_PROTOTYPE((krb5_context)); -#endif /* !defined(_MACINTOSH) && !defined(_MSDOS) */ +#endif /* !defined(_MACINTOSH) && !defined(_MSDOS) && !defined(WIN32) */ #endif /* KRB5_KDB5_DBM__ */ diff --git a/src/include/krb5/winsock.h b/src/include/krb5/kwinsock.h index f4c1288684..f4c1288684 100644 --- a/src/include/krb5/winsock.h +++ b/src/include/krb5/kwinsock.h |