From 428acda685e3d4ebd4b32400b7a5658f09d8ae0d Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Sat, 15 Jun 2002 06:14:23 +0000 Subject: [PATCH] * krb5.hin: Conditionalize KRB5_CALLCONV_WRONG separately because gssapi.h defines KRB5_CALLCONV but doesn't need KRB5_CALLCONV_WRONG [pullup from 1-2-2-branch] * krb5.hin: Rename krb5_kt_free_entry_contents as krb5_free_keytab_entry_contents to make it consistent with rest of API. Add KRB5_CALLCONV_WRONG. Fix up various calling conventions. For Win32, add KT an CC accessors and default to not PRIVATE. * krb5.hin: Make krb5_build_principal_va() KRB5_CALLCONV. [pullups from 1-2-2-branch] * krb5.hin: Conditionalized pragmas for Metrowerks * krb5.hin: Updated Mac OS X headers to new framework layout [pullups from 1-2-2-branch] * krb5.hin: Updated Mac OS #defines and #includes for new header layout and Mac OS X frameworks [pullups from 1-2-2-branch] git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14513 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/ChangeLog | 34 +++++++++++++++++++++ src/include/krb5.hin | 70 +++++++++++++++++++++++++++++++++---------- 2 files changed, 88 insertions(+), 16 deletions(-) diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 8a8262223..aaf2ff271 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,37 @@ +2002-06-15 Alexandra Ellwood + + * krb5.hin: Conditionalize KRB5_CALLCONV_WRONG separately + because gssapi.h defines KRB5_CALLCONV but doesn't need + KRB5_CALLCONV_WRONG + [pullup from 1-2-2-branch] + +2002-06-15 Danilo Almeida + + * krb5.hin: Rename krb5_kt_free_entry_contents as + krb5_free_keytab_entry_contents to make it consistent with rest of + API. Add KRB5_CALLCONV_WRONG. Fix up various calling + conventions. For Win32, add KT an CC accessors and default to not + PRIVATE. + + * krb5.hin: Make krb5_build_principal_va() KRB5_CALLCONV. + + [pullups from 1-2-2-branch] + +2002-06-15 Alexandra Ellwood + + * krb5.hin: Conditionalized pragmas for Metrowerks + + * krb5.hin: Updated Mac OS X headers to new framework layout + + [pullups from 1-2-2-branch] + +2002-06-15 Miro Jurisic + + * krb5.hin: Updated Mac OS #defines + and #includes for new header layout and Mac OS X frameworks + + [pullups from 1-2-2-branch] + 2002-06-14 Alexandra Ellwood * k5-int.h: Added krb5_kt_dfl_ops for KRB5_KEYTAB_ACCESSOR_FUNCTIONS diff --git a/src/include/krb5.hin b/src/include/krb5.hin index bc2034c61..9356e1d6e 100644 --- a/src/include/krb5.hin +++ b/src/include/krb5.hin @@ -57,17 +57,34 @@ #define KRB5_GENERAL__ #ifndef KRB5_DEPRECATED -#define KRB5_DEPRECATED 1 /* Expose deprecated things for now. */ +#define KRB5_DEPRECATED 1 /* Expose deprecated things for now. */ #endif -#if defined(_WIN32) || defined(macintosh) -#include -/* Macintoh CFM-68K magic incantation */ -#if defined(macintosh) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__) -#pragma import on +#if defined(macintosh) || (defined(__MACH__) && defined(__APPLE__)) + #include + #if TARGET_RT_MAC_CFM + #error "Use KfM 4.0 SDK headers for CFM compilation." + #endif + + #ifndef KRB5_PRIVATE /* Allow e.g. build system to override */ + #define KRB5_PRIVATE 0 + #endif +#else +#if defined(_WIN32) + #ifndef KRB5_PRIVATE + #define KRB5_PRIVATE 0 + #endif +#else + #ifndef KRB5_PRIVATE + #define KRB5_PRIVATE 1 + #endif #endif #endif +#if defined(_MSDOS) || defined(_WIN32) +#include +#endif + #ifndef KRB5_CONFIG__ #ifndef KRB5_CALLCONV #define KRB5_CALLCONV @@ -75,6 +92,10 @@ #endif /* !KRB5_CALLCONV */ #endif /* !KRB5_CONFIG__ */ +#ifndef KRB5_CALLCONV_WRONG +#define KRB5_CALLCONV_WRONG +#endif + #ifndef THREEPARAMOPEN #define THREEPARAMOPEN(x,y,z) open(x,y,z) #endif @@ -84,6 +105,12 @@ #include #include /* for *_MAX */ +#if TARGET_OS_MAC + #include +#else + #include +#endif + #ifndef KRB5INT_BEGIN_DECLS #if defined(__cplusplus) #define KRB5INT_BEGIN_DECLS extern "C" { @@ -96,6 +123,14 @@ KRB5INT_BEGIN_DECLS +#if TARGET_OS_MAC + #if defined(__MWERKS__) + #pragma import on + #pragma enumsalwaysint on + #endif + #pragma options align=mac68k +#endif + /* from profile.h */ struct _profile_t; /* typedef struct _profile_t *profile_t; */ @@ -1492,11 +1527,11 @@ krb5_error_code KRB5_CALLCONV krb5_unparse_name_ext krb5_error_code KRB5_CALLCONV krb5_set_principal_realm (krb5_context, krb5_principal, const char *); -krb5_boolean krb5_address_search +krb5_boolean KRB5_CALLCONV_WRONG krb5_address_search (krb5_context, const krb5_address *, krb5_address * const *); -krb5_boolean krb5_address_compare +krb5_boolean KRB5_CALLCONV_WRONG krb5_address_compare (krb5_context, const krb5_address *, const krb5_address *); @@ -1588,7 +1623,7 @@ krb5_error_code KRB5_CALLCONV_C krb5_build_principal (krb5_context, krb5_principal *, unsigned int, const char *, ...); #ifdef va_start /* XXX depending on varargs include file defining va_start... */ -krb5_error_code krb5_build_principal_va +krb5_error_code KRB5_CALLCONV krb5_build_principal_va (krb5_context, krb5_principal, unsigned int, const char *, va_list); #endif @@ -2055,7 +2090,7 @@ krb5_error_code KRB5_CALLCONV krb5_auth_con_getflags krb5_auth_context, krb5_int32 *); -krb5_error_code krb5_auth_con_setaddrs +krb5_error_code KRB5_CALLCONV_WRONG krb5_auth_con_setaddrs (krb5_context, krb5_auth_context, krb5_address *, @@ -2133,7 +2168,7 @@ krb5_error_code KRB5_CALLCONV krb5_auth_con_setrcache krb5_auth_context, krb5_rcache); -krb5_error_code krb5_auth_con_getrcache +krb5_error_code KRB5_CALLCONV_WRONG krb5_auth_con_getrcache (krb5_context, krb5_auth_context, krb5_rcache *); @@ -2483,13 +2518,16 @@ typedef krb5_int32 krb5_prompt_type; krb5_prompt_type* KRB5_CALLCONV krb5_get_prompt_types (krb5_context context); -KRB5INT_END_DECLS - -/* Macintoh CFM-68K magic incantation */ -#if defined(macintosh) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__) -#pragma import reset +#if TARGET_OS_MAC + #if defined(__MWERKS__) + #pragma enumsalwaysint reset + #pragma import reset + #endif + #pragma options align=reset #endif +KRB5INT_END_DECLS + /* Don't use this! We're going to phase it out. It's just here to keep applications from breaking right away. */ #define krb5_const const -- 2.26.2