summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMat <mberchtold@gmail.com>2016-01-09 20:22:17 +0100
committerRich Salz <rsalz@openssl.org>2016-01-09 19:04:02 -0500
commit77f31b3a8a7a2c3ee5a3a4da9843b4b224b32300 (patch)
tree13785d971deb3c6b72d27fb651fdb2a4e667f94c
parent3e45d39347dc901fa2f8c9bded8d2b3940c103f0 (diff)
Adds missing type casts
This fixes https://github.com/openssl/openssl/issues/534 Signed-off-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org>
-rw-r--r--include/openssl/safestack.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/openssl/safestack.h b/include/openssl/safestack.h
index 9eb4477001..71d639f1d0 100644
--- a/include/openssl/safestack.h
+++ b/include/openssl/safestack.h
@@ -96,7 +96,7 @@ extern "C" {
} \
static ossl_inline t2 *sk_##t1##_value(const STACK_OF(t1) *sk, int idx) \
{ \
- return sk_value((_STACK *)sk, idx); \
+ return (t2 *)sk_value((_STACK *)sk, idx); \
} \
static ossl_inline STACK_OF(t1) *sk_##t1##_new(int (*cmpf)(const t3 * const *a, const t3 * const *b)) \
{ \
@@ -116,11 +116,11 @@ extern "C" {
} \
static ossl_inline t2 *sk_##t1##_delete(STACK_OF(t1) *sk, int i) \
{ \
- return sk_delete((_STACK *)sk, i); \
+ return (t2 *)sk_delete((_STACK *)sk, i); \
} \
static ossl_inline t2 *sk_##t1##_delete_ptr(STACK_OF(t1) *sk, t2 *ptr) \
{ \
- return sk_delete_ptr((_STACK *)sk, (void *)ptr); \
+ return (t2 *)sk_delete_ptr((_STACK *)sk, (void *)ptr); \
} \
static ossl_inline int sk_##t1##_push(STACK_OF(t1) *sk, t2 *ptr) \
{ \
@@ -148,7 +148,7 @@ extern "C" {
} \
static ossl_inline t2 *sk_##t1##_set(STACK_OF(t1) *sk, int idx, t2 *ptr) \
{ \
- return sk_set((_STACK *)sk, idx, (void *)ptr); \
+ return (t2 *)sk_set((_STACK *)sk, idx, (void *)ptr); \
} \
static ossl_inline int sk_##t1##_find(STACK_OF(t1) *sk, t2 *ptr) \
{ \