From c1f822f7af08e2c8cb3ec4908764cfcb7214164c Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Sun, 6 Oct 2013 16:42:05 -0400 Subject: [PATCH] rename struct krb5_name_canon_* name collisions C++ does not permit struct names and typedef names to be the same. Rename struct krb5_name_canon_rule to struct krb5_name_canon_rule_data and struct krb5_name_canon_iterator to struct krb5_name_canon_iterator_data Change-Id: I92766e0878bf0beef92de1649baf9e5cafbf86aa --- lib/krb5/krb5.h | 4 ++-- lib/krb5/principal.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/krb5/krb5.h b/lib/krb5/krb5.h index 9d1141ad4..71b0eb1b2 100644 --- a/lib/krb5/krb5.h +++ b/lib/krb5/krb5.h @@ -929,8 +929,8 @@ typedef enum krb5_name_canon_rule_options { KRB5_NCRO_SECURE = 1 << 2 } krb5_name_canon_rule_options; -typedef struct krb5_name_canon_rule *krb5_name_canon_rule; -typedef struct krb5_name_canon_iterator *krb5_name_canon_iterator; +typedef struct krb5_name_canon_rule_data *krb5_name_canon_rule; +typedef struct krb5_name_canon_iterator_data *krb5_name_canon_iterator; /* * diff --git a/lib/krb5/principal.c b/lib/krb5/principal.c index ebd752790..27efcab11 100644 --- a/lib/krb5/principal.c +++ b/lib/krb5/principal.c @@ -1256,7 +1256,7 @@ typedef enum krb5_name_canon_rule_type { KRB5_NCRT_NSS } krb5_name_canon_rule_type; -struct krb5_name_canon_rule { +struct krb5_name_canon_rule_data { krb5_name_canon_rule next; krb5_name_canon_rule_type type; krb5_name_canon_rule_options options; @@ -1931,7 +1931,7 @@ _krb5_free_name_canon_rules(krb5_context context, krb5_name_canon_rule rules) rules = NULL; } -struct krb5_name_canon_iterator { +struct krb5_name_canon_iterator_data { krb5_name_canon_rule rules; krb5_name_canon_rule rule; krb5_const_principal in_princ;