diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2007-06-08 00:26:16 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2007-06-08 00:26:16 +0000 |
| commit | 54b5fd537f7a7ac1874359fd42a4721b6839f7a1 (patch) | |
| tree | 28839ccc94d178c059a6b7620e2926878bdfea98 | |
| parent | 0b99d4f1d1ad1f57b2a2eaf0548823802a8f7330 (diff) | |
WIN32 fixes.
| -rw-r--r-- | crypto/asn1/asn1t.h | 9 | ||||
| -rw-r--r-- | crypto/seed/seed.h | 2 | ||||
| -rw-r--r-- | crypto/stack/safestack.h | 10 |
3 files changed, 17 insertions, 4 deletions
diff --git a/crypto/asn1/asn1t.h b/crypto/asn1/asn1t.h index c7e394bfe3..fc7ea0d1b2 100644 --- a/crypto/asn1/asn1t.h +++ b/crypto/asn1/asn1t.h @@ -811,7 +811,14 @@ typedef struct ASN1_PRINT_ARG_st { } #define IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname) \ - IMPLEMENT_ASN1_ALLOC_FUNCTIONS_pfname(/**/, stname, itname, fname) + stname *fname##_new(void) \ + { \ + return (stname *)ASN1_item_new(ASN1_ITEM_rptr(itname)); \ + } \ + void fname##_free(stname *a) \ + { \ + ASN1_item_free((ASN1_VALUE *)a, ASN1_ITEM_rptr(itname)); \ + } #define IMPLEMENT_ASN1_FUNCTIONS_fname(stname, itname, fname) \ IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(stname, itname, fname) \ diff --git a/crypto/seed/seed.h b/crypto/seed/seed.h index 427915ed9a..6ffa5f024e 100644 --- a/crypto/seed/seed.h +++ b/crypto/seed/seed.h @@ -82,6 +82,8 @@ #define HEADER_SEED_H #include <openssl/opensslconf.h> +#include <openssl/e_os2.h> +#include <openssl/crypto.h> #ifdef OPENSSL_NO_SEED #error SEED is disabled. diff --git a/crypto/stack/safestack.h b/crypto/stack/safestack.h index 5da6d9a16f..53c1695f2a 100644 --- a/crypto/stack/safestack.h +++ b/crypto/stack/safestack.h @@ -57,10 +57,14 @@ #include <openssl/stack.h> -#ifdef OPENSSL_NO_FCAST +#ifndef OPENSSL_ALLOW_FCAST #ifndef OPENSSL_INLINE -#define OPENSSL_INLINE static inline +#ifdef OPENSSL_SYSNAME_WIN32 +#define OPENSSL_INLINE __inline static +#else +#define OPENSSL_INLINE inline static +#endif #endif #define STACK_OF(type) struct stack_st_##type @@ -74,7 +78,7 @@ STACK_OF(type) \ }; \ OPENSSL_INLINE STACK_OF(type) *sk_##type##_new( \ int (*cmp)(const type * const *, const type *const *)) \ - { return (STACK_OF(type) *)sk_new((int (*)())cmp); } \ + { return (STACK_OF(type) *)sk_new((int (*)(const char * const *, const char * const *))cmp); } \ OPENSSL_INLINE STACK_OF(type) *sk_##type##_new_null() \ { return (STACK_OF(type) *)sk_new_null(); } \ OPENSSL_INLINE void sk_##type##_free(STACK_OF(type) *sk) \ |