oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

rename struct krb5_name_canon_* name collisions

Browse Source 
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
This commit is contained in:
Jeffrey Altman
2013-10-06 16:42:05 -04:00
parent a2ca442760
commit c1f822f7af
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/krb5/krb5.h
View File

@@ -929,8 +929,8 @@ typedef enum krb5_name_canon_rule_options {
KRB5_NCRO_SECURE = 1 << 2 KRB5_NCRO_SECURE = 1 << 2
} krb5_name_canon_rule_options; } krb5_name_canon_rule_options;
typedef struct krb5_name_canon_rule *krb5_name_canon_rule; typedef struct krb5_name_canon_rule_data *krb5_name_canon_rule;
typedef struct krb5_name_canon_iterator *krb5_name_canon_iterator; typedef struct krb5_name_canon_iterator_data *krb5_name_canon_iterator;
/* /*
* *

4
lib/krb5/principal.c
View File

@@ -1256,7 +1256,7 @@ typedef enum krb5_name_canon_rule_type {
KRB5_NCRT_NSS KRB5_NCRT_NSS
} krb5_name_canon_rule_type; } 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 next;
krb5_name_canon_rule_type type; krb5_name_canon_rule_type type;
krb5_name_canon_rule_options options; 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; rules = NULL;
} }
struct krb5_name_canon_iterator { struct krb5_name_canon_iterator_data {
krb5_name_canon_rule rules; krb5_name_canon_rule rules;
krb5_name_canon_rule rule; krb5_name_canon_rule rule;
krb5_const_principal in_princ; krb5_const_principal in_princ;