From 1df63e93f9d7a1d2ebf929d1fe99f1b9b46e237e Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Thu, 12 Mar 2015 13:54:27 -0700 Subject: [PATCH] Fix a couple of issues with building with strict C99. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit C99 doesn't, technically, allow empty statements. Thus if a #define'ed function ends in a semicolon, and the use of it also ends in a semicolon, then the compiler sees “;;” at the end. Since a choice has to be made, I prefer that the semicolon exist at the “callsite” of a #define'ed fuction. But I haven't gone and changed everything to follow that in this patch. Change-Id: I1343e52a5ac6255db49aa053048d0df3225bcf43 Reviewed-on: https://boringssl-review.googlesource.com/3890 Reviewed-by: David Benjamin Reviewed-by: Adam Langley --- include/openssl/asn1.h | 2 +- include/openssl/stack.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h index 5c5e990f..4baf81c6 100644 --- a/include/openssl/asn1.h +++ b/include/openssl/asn1.h @@ -517,7 +517,7 @@ struct X509_algor_st } /* X509_ALGOR */; DEFINE_STACK_OF(X509_ALGOR); -DECLARE_ASN1_FUNCTIONS(X509_ALGOR); +DECLARE_ASN1_FUNCTIONS(X509_ALGOR) typedef struct NETSCAPE_X509_st { diff --git a/include/openssl/stack.h b/include/openssl/stack.h index 287ca729..350fa145 100644 --- a/include/openssl/stack.h +++ b/include/openssl/stack.h @@ -114,7 +114,7 @@ typedef struct stack_st { #define DEFINE_STACK_OF(type) \ STACK_OF(type) {\ _STACK stack; \ -}; +} #define DECLARE_STACK_OF(type) STACK_OF(type);