Commit 0a56761f authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Avoid warning about empty structures and always define CHECKED_PTR_OF

parent 220903f9

crypto/lhash/lhash.h

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ void lh_node_usage_stats_bio(const _LHASH *lh, BIO *out); 


#define LHASH_OF(type) struct lhash_st_##type



#define DECLARE_LHASH_OF(type) LHASH_OF(type) { }

#define DECLARE_LHASH_OF(type) LHASH_OF(type) { int dummy; }



#define CHECKED_LHASH_OF(type,lh) \

  ((_LHASH *)CHECKED_PTR_OF(LHASH_OF(type),lh))

crypto/stack/safestack.h

+2 −2
Original line number Diff line number Diff line
@@ -57,13 +57,13 @@ 


#include <openssl/stack.h>



#ifdef DEBUG_SAFESTACK



#ifndef CHECKED_PTR_OF

#define CHECKED_PTR_OF(type, p) \

    ((void*) (1 ? p : (type*)0))

#endif



#ifdef DEBUG_SAFESTACK



#define CHECKED_SK_FREE_FUNC(type, p) \

    ((void (*)(void *)) ((1 ? p : (void (*)(type *))0)))