[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  c828cd7cd0426dde10b07e7b68f3741a5ea91fc6 (commit)
      from  7793e17440539b71aee62afd81846717d9423f2e (commit)


- Log -----------------------------------------------------------------
commit c828cd7cd0426dde10b07e7b68f3741a5ea91fc6
Author: Jeffrey Walton <noloader at gmail.com>
Date:   Fri Mar 25 09:06:47 2016 -0400

    RT4476: Fix some cast-alignment warnings
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/lhash.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/openssl/lhash.h b/include/openssl/lhash.h
index 2edd738..e10c522 100644
--- a/include/openssl/lhash.h
+++ b/include/openssl/lhash.h
@@ -180,7 +180,7 @@ void lh_node_usage_stats_bio(const _LHASH *lh, BIO *out);
 # define LHASH_OF(type) struct lhash_st_##type
 
 # define DEFINE_LHASH_OF(type) \
-    LHASH_OF(type) { int dummy; }; \
+    LHASH_OF(type) { union { void* d1; unsigned long d2; int d3; }; }; \
     static ossl_inline LHASH_OF(type) * \
         lh_##type##_new(unsigned long (*hfn)(const type *), \
                         int (*cfn)(const type *, const type *)) \