X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Flhash%2Flhash.h;h=e7d87635911af99f0472c3a7fd60e1310230b296;hb=da01515c404fcfc389d437fc07ac6734e9aea20d;hp=558c11c6e4cdd24ef9700cb41f225bf22362d432;hpb=0a56761f1942ca27e7a573a1a083e20910eba996;p=oweals%2Fopenssl.git diff --git a/crypto/lhash/lhash.h b/crypto/lhash/lhash.h index 558c11c6e4..e7d8763591 100644 --- a/crypto/lhash/lhash.h +++ b/crypto/lhash/lhash.h @@ -230,25 +230,8 @@ void lh_node_usage_stats_bio(const _LHASH *lh, BIO *out); lh_stats_bio(CHECKED_LHASH_OF(type, lh), out) #define LHM_lh_free(type, lh) lh_free(CHECKED_LHASH_OF(type, lh)) - -/* Strings are special: normally an lhash entry will point to a single - * (somewhat) mutable object. In the case of strings: - * - * a) Instead of a single char, there is an array of chars, NUL-terminated. - * b) The string may have be immutable. - * - * So, they need their own declarations. Especially important for - * type-checking tools, such as Deputy. - * - * In practice, however, it appears to be hard to have a const - * string. For now, I'm settling for dealing with the fact it is a - * string at all. - */ -typedef char *STRING; -DECLARE_LHASH_OF(STRING); - -typedef const char *CSTRING; -DECLARE_LHASH_OF(CSTRING); +DECLARE_LHASH_OF(OPENSSL_STRING); +DECLARE_LHASH_OF(OPENSSL_CSTRING); #ifdef __cplusplus }