]> git.ipfire.org Git - thirdparty/krb5.git/commitdiff
Don't use "bool" for ASN.1 boolean macros
authorNate Rosenblum <nater@maginatics.com>
Tue, 14 May 2013 03:26:31 +0000 (20:26 -0700)
committerGreg Hudson <ghudson@mit.edu>
Tue, 14 May 2013 04:03:08 +0000 (00:03 -0400)
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

index 68a907fce44212d375d5b48c8943b8bed070a74d..b4c15bb7477d07dcb8c6c011ee002f84eec7a426 100644 (file)
@@ -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
 };