diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-10-14 22:04:14 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-10-14 22:04:14 +0000 |
| commit | ffbfbef94353d297cf6acd9081bb1f13dd8266e1 (patch) | |
| tree | 9dd5752e485b0f1365d5008e240fd7e7fffe3574 | |
| parent | 1fb2e0f940fa77b3b62544a7ce2f589e5cc05826 (diff) | |
more vxworks patches
| -rw-r--r-- | crypto/pkcs7/bio_pk7.c | 2 | ||||
| -rw-r--r-- | crypto/rand/randfile.c | 5 | ||||
| -rw-r--r-- | crypto/ui/ui_openssl.c | 6 | ||||
| -rw-r--r-- | ssl/dtls1.h | 4 |
4 files changed, 15 insertions, 2 deletions
diff --git a/crypto/pkcs7/bio_pk7.c b/crypto/pkcs7/bio_pk7.c index c8d06d6cdc..0fd31e730f 100644 --- a/crypto/pkcs7/bio_pk7.c +++ b/crypto/pkcs7/bio_pk7.c @@ -56,7 +56,7 @@ #include <openssl/pkcs7.h> #include <openssl/bio.h> -#ifndef OPENSSL_SYSNAME_NETWARE +#if !defined(OPENSSL_SYSNAME_NETWARE) && !defined(OPENSSL_SYSNAME_VXWORKS) #include <memory.h> #endif #include <stdio.h> diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c index bc7d9c5804..5b1109d665 100644 --- a/crypto/rand/randfile.c +++ b/crypto/rand/randfile.c @@ -56,15 +56,18 @@ * [including the GNU Public Licence.] */ +#include "e_os.h" + /* We need to define this to get macros like S_IFBLK and S_IFCHR */ +#if !defined(OPENSSL_SYS_VXWORKS) #define _XOPEN_SOURCE 500 +#endif #include <errno.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include "e_os.h" #include <openssl/crypto.h> #include <openssl/rand.h> #include <openssl/buffer.h> diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c index 1bc25f48d5..fd9c4a8169 100644 --- a/crypto/ui/ui_openssl.c +++ b/crypto/ui/ui_openssl.c @@ -122,9 +122,15 @@ * sigaction and fileno included. -pedantic would be more appropriate for * the intended purposes, but we can't prevent users from adding -ansi. */ +#if defined(OPENSSL_SYSNAME_VXWORKS) +#include <sys/types.h> +#endif + +#if !defined(OPENSSL_SYSNAME_VXWORKS) #ifndef _POSIX_C_SOURCE #define _POSIX_C_SOURCE 2 #endif +#endif /* !OPENSSL_SYSNAME_VXWORKS */ #include <signal.h> #include <stdio.h> #include <string.h> diff --git a/ssl/dtls1.h b/ssl/dtls1.h index 6317da958f..2b1d1e7c68 100644 --- a/ssl/dtls1.h +++ b/ssl/dtls1.h @@ -72,8 +72,12 @@ #elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_) #include <sys/timeval.h> #else +#if defined(OPENSSL_SYS_VXWORKS) +#include <sys/times.h> +#else #include <sys/time.h> #endif +#endif #ifdef __cplusplus extern "C" { |