From 5a5745682a98943618fdb8f3b5b76861e7663b4e Mon Sep 17 00:00:00 2001 From: Alexandra Ellwood Date: Tue, 7 Nov 2006 20:15:40 +0000 Subject: [PATCH] krb5.h not C++-safe due to "struct krb5_cccol_cursor" Fixed definition of "struct krb5_cccol_cursor" in krb5.h to be C++ safe. In C++ the struct name is also a type so there can't be a typedef of the same name, in this case "typedef struct krb5_cccol_cursor *krb5_cccol_cursor;". ticket: new status: open target_version: 1.6 tags: pullup git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18765 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/krb5/krb5.hin | 4 ++-- src/lib/krb5/ccache/cccursor.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin index 2ad6be9c8..081a43ffc 100644 --- a/src/include/krb5/krb5.hin +++ b/src/include/krb5/krb5.hin @@ -1215,8 +1215,8 @@ typedef struct _krb5_cc_ops krb5_cc_ops; /* * Cursor for iterating over all ccaches */ -struct krb5_cccol_cursor; -typedef struct krb5_cccol_cursor *krb5_cccol_cursor; +struct _krb5_cccol_cursor; +typedef struct _krb5_cccol_cursor *krb5_cccol_cursor; /* for retrieve_cred */ #define KRB5_TC_MATCH_TIMES 0x00000001 diff --git a/src/lib/krb5/ccache/cccursor.c b/src/lib/krb5/ccache/cccursor.c index 9a57d5223..ab6f2a971 100644 --- a/src/lib/krb5/ccache/cccursor.c +++ b/src/lib/krb5/ccache/cccursor.c @@ -43,7 +43,7 @@ struct cc_fullname { char *res; }; -struct krb5_cccol_cursor { +struct _krb5_cccol_cursor { int pos; krb5_cc_typecursor typecursor; const krb5_cc_ops *ops; -- 2.26.2