diff options
| author | bubulle <bubulle@alioth.debian.org> | 2011-11-12 13:00:54 +0000 |
|---|---|---|
| committer | bubulle <bubulle@alioth.debian.org> | 2011-11-12 13:00:54 +0000 |
| commit | 6fba685eec3a1165ec0b82d72d3ae71e946a1404 (patch) | |
| tree | f3c0543c8f9df4a22ed62e3bd99d9d7bc1054c14 /source4/heimdal/lib/roken/resolve.h | |
| parent | 77a7925c0509068d5cd2affd94a3996d0a86035a (diff) | |
| download | samba-6fba685eec3a1165ec0b82d72d3ae71e946a1404.tar.gz | |
Merge upstream 3.6.1 source
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@3972 fc4039ab-9d04-0410-8cac-899223bdd6b0
Diffstat (limited to 'source4/heimdal/lib/roken/resolve.h')
| -rw-r--r-- | source4/heimdal/lib/roken/resolve.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source4/heimdal/lib/roken/resolve.h b/source4/heimdal/lib/roken/resolve.h index 91b2afefe7..fc1e97fc63 100644 --- a/source4/heimdal/lib/roken/resolve.h +++ b/source4/heimdal/lib/roken/resolve.h @@ -38,9 +38,11 @@ #ifndef ROKEN_LIB_FUNCTION #ifdef _WIN32 -#define ROKEN_LIB_FUNCTION _stdcall +#define ROKEN_LIB_FUNCTION +#define ROKEN_LIB_CALL __cdecl #else #define ROKEN_LIB_FUNCTION +#define ROKEN_LIB_CALL #endif #endif @@ -151,7 +153,7 @@ struct rk_sig_record { unsigned sig_inception; unsigned key_tag; char *signer; - unsigned sig_len; + size_t sig_len; char sig_data[1]; /* also includes signer */ }; @@ -174,7 +176,7 @@ struct rk_ds_record { unsigned key_tag; unsigned algorithm; unsigned digest_type; - unsigned digest_len; + size_t digest_len; u_char digest_data[1]; }; @@ -231,15 +233,15 @@ struct rk_dns_reply{ extern "C" { #endif -struct rk_dns_reply* ROKEN_LIB_FUNCTION +ROKEN_LIB_FUNCTION struct rk_dns_reply* ROKEN_LIB_CALL rk_dns_lookup(const char *, const char *); -void ROKEN_LIB_FUNCTION +ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL rk_dns_free_data(struct rk_dns_reply *); -int ROKEN_LIB_FUNCTION +ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL rk_dns_string_to_type(const char *name); -const char *ROKEN_LIB_FUNCTION +ROKEN_LIB_FUNCTION const char * ROKEN_LIB_CALL rk_dns_type_to_string(int type); -void ROKEN_LIB_FUNCTION +ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL rk_dns_srv_order(struct rk_dns_reply*); #ifdef __cplusplus |