diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/k5-int.h | 6 | ||||
| -rw-r--r-- | src/include/win-mac.h | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/include/k5-int.h b/src/include/k5-int.h index a0d7c1728..9a81d3bbc 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -2347,10 +2347,10 @@ typedef struct _krb5int_access { /* Used for encrypted challenge fast factor*/ krb5_error_code (*encode_enc_data)(const krb5_enc_data *, krb5_data **); krb5_error_code (*decode_enc_data)(const krb5_data *, krb5_enc_data **); - void (*free_enc_data)(krb5_context, krb5_enc_data *); + void (KRB5_CALLCONV *free_enc_data)(krb5_context, krb5_enc_data *); krb5_error_code (*encode_enc_ts)(const krb5_pa_enc_ts *, krb5_data **); krb5_error_code (*decode_enc_ts)(const krb5_data *, krb5_pa_enc_ts **); - void (*free_enc_ts)(krb5_context, krb5_pa_enc_ts *); + void (KRB5_CALLCONV *free_enc_ts)(krb5_context, krb5_pa_enc_ts *); krb5_error_code (*encrypt_helper)(krb5_context, const krb5_keyblock *, krb5_keyusage, const krb5_data *, krb5_enc_data *); @@ -2668,7 +2668,7 @@ void krb5int_dbgref_dump_principal(char *, krb5_principal); #endif /* Common hostname-parsing code. */ -krb5_error_code KRB5_CALLCONV +krb5_error_code krb5int_clean_hostname(krb5_context, const char *, char *, size_t); krb5_error_code diff --git a/src/include/win-mac.h b/src/include/win-mac.h index 85f7a376f..84ffe7976 100644 --- a/src/include/win-mac.h +++ b/src/include/win-mac.h @@ -195,10 +195,10 @@ typedef _W64 int ssize_t; * Functions with slightly different names on the PC */ #ifndef strcasecmp -#define strcasecmp stricmp +#define strcasecmp _stricmp #endif #ifndef strncasecmp -#define strncasecmp strnicmp +#define strncasecmp _strnicmp #endif /* VS2005 has deprecated strdup */ @@ -206,6 +206,9 @@ typedef _W64 int ssize_t; #define strdup _strdup #endif +/* Windows has its own name for reentrant strtok. */ +#define strtok_r strtok_s + HINSTANCE get_lib_instance(void); #define GETSOCKNAME_ARG2_TYPE struct sockaddr |