From 9f392c134fae066660cf56bcbcd8e1012677960a Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 21 Feb 2014 10:19:30 +1300 Subject: [PATCH] heimdal: rename send and recv pointers to avoid conflict with socket wrapper --- lib/krb5/send_to_kdc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/krb5/send_to_kdc.c b/lib/krb5/send_to_kdc.c index e256e8392..fd8558f37 100644 --- a/lib/krb5/send_to_kdc.c +++ b/lib/krb5/send_to_kdc.c @@ -291,8 +291,8 @@ struct host; struct host_fun { krb5_error_code (*prepare)(krb5_context, struct host *, const krb5_data *); - krb5_error_code (*send)(krb5_context, struct host *); - krb5_error_code (*recv)(krb5_context, struct host *, krb5_data *); + krb5_error_code (*send_fn)(krb5_context, struct host *); + krb5_error_code (*recv_fn)(krb5_context, struct host *, krb5_data *); int ntries; }; @@ -722,7 +722,7 @@ eval_host_state(krb5_context context, debug_host(context, 5, host, "reading packet"); - ret = host->fun->recv(context, host, &ctx->response); + ret = host->fun->recv_fn(context, host, &ctx->response); if (ret == -1) { /* not done yet */ } else if (ret == 0) { @@ -741,7 +741,7 @@ eval_host_state(krb5_context context, debug_host(context, 5, host, "writing packet"); - ret = host->fun->send(context, host); + ret = host->fun->send_fn(context, host); if (ret == -1) { /* not done yet */ } else if (ret) {