generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WIN32 fixes.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2007-06-08 00:26:16 +00:00
parent 0b99d4f1d1
commit 54b5fd537f
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crypto/asn1/asn1t.h
View File

@ -811,7 +811,14 @@ typedef struct ASN1_PRINT_ARG_st {
} }
#define IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname) \ #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) \ #define IMPLEMENT_ASN1_FUNCTIONS_fname(stname, itname, fname) \
IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(stname, itname, fname) \ IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(stname, itname, fname) \

2
crypto/seed/seed.h
View File

@ -82,6 +82,8 @@
#define HEADER_SEED_H #define HEADER_SEED_H
#include <openssl/opensslconf.h> #include <openssl/opensslconf.h>
#include <openssl/e_os2.h>
#include <openssl/crypto.h>
#ifdef OPENSSL_NO_SEED #ifdef OPENSSL_NO_SEED
#error SEED is disabled. #error SEED is disabled.

10
crypto/stack/safestack.h
View File

@ -57,10 +57,14 @@
#include <openssl/stack.h> #include <openssl/stack.h>
#ifdef OPENSSL_NO_FCAST #ifndef OPENSSL_ALLOW_FCAST
#ifndef OPENSSL_INLINE #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 #endif
#define STACK_OF(type) struct stack_st_##type #define STACK_OF(type) struct stack_st_##type
@ -74,7 +78,7 @@ STACK_OF(type) \
}; \ }; \
OPENSSL_INLINE STACK_OF(type) *sk_##type##_new( \ OPENSSL_INLINE STACK_OF(type) *sk_##type##_new( \
int (*cmp)(const type * const *, const type *const *)) \ 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() \ OPENSSL_INLINE STACK_OF(type) *sk_##type##_new_null() \
{ return (STACK_OF(type) *)sk_new_null(); } \ { return (STACK_OF(type) *)sk_new_null(); } \
OPENSSL_INLINE void sk_##type##_free(STACK_OF(type) *sk) \ OPENSSL_INLINE void sk_##type##_free(STACK_OF(type) *sk) \