more vxworks patches

diff --git a/crypto/pkcs7/bio_pk7.c b/crypto/pkcs7/bio_pk7.c
index c8d06d6cdc83e39eeea23f1f5eeb89ec8a8dd1b4..0fd31e730ffab582f6dcb5ae06a416f2eaaf0657 100644 (file)
--- 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 bc7d9c58049df58b7ac1a098befff75ffa8eb712..5b1109d665a50b43083f9c904fe9f25243955e54 100644 (file)
--- 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 1bc25f48d5e1dac06b29562355d801781b6f32f9..fd9c4a8169877e303bcd8bca1481de5fa3be4990 100644 (file)
--- 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 6317da958fccc2608942d3a39cd7cd4170d45112..2b1d1e7c68299e880e60c4e92d785a8e1ab06194 100644 (file)
--- 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" {