From 1799f7b5d9cf4390148248d603d99a3695ddfafe Mon Sep 17 00:00:00 2001 From: Nate Rosenblum Date: Mon, 13 May 2013 20:26:31 -0700 Subject: [PATCH] Don't use "bool" for ASN.1 boolean macros When building for IOS targets with clang, the stdbool.h header is included by default. This header includes the following C99 definition: #define bool _Bool which wrecks havoc with the DEFBOOLTYPE macro. ticket: 7525 --- src/lib/krb5/asn.1/asn1_k_encode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/krb5/asn.1/asn1_k_encode.c b/src/lib/krb5/asn.1/asn1_k_encode.c index 68a907fce4..b4c15bb747 100644 --- a/src/lib/krb5/asn.1/asn1_k_encode.c +++ b/src/lib/krb5/asn.1/asn1_k_encode.c @@ -41,7 +41,7 @@ init_int32_minus1(void *p) *(krb5_int32 *)p = -1; } -DEFBOOLTYPE(bool, krb5_boolean); +DEFBOOLTYPE(boolean, krb5_boolean); DEFINTTYPE(int32, krb5_int32); DEFPTRTYPE(int32_ptr, int32); DEFCOUNTEDSEQOFTYPE(cseqof_int32, krb5_int32, int32_ptr); @@ -1008,7 +1008,7 @@ static const struct atype_info *pa_s4u_x509_user_fields[] = { }; DEFSEQTYPE(pa_s4u_x509_user, krb5_pa_s4u_x509_user, pa_s4u_x509_user_fields); -DEFFIELD(pa_pac_req_0, krb5_pa_pac_req, include_pac, 0, bool); +DEFFIELD(pa_pac_req_0, krb5_pa_pac_req, include_pac, 0, boolean); static const struct atype_info *pa_pac_req_fields[] = { &k5_atype_pa_pac_req_0 }; -- 2.47.2