more vxworks patches
authorDr. Stephen Henson <steve@openssl.org>
Fri, 14 Oct 2011 22:04:14 +0000 (22:04 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Fri, 14 Oct 2011 22:04:14 +0000 (22:04 +0000)
crypto/pkcs7/bio_pk7.c
crypto/rand/randfile.c
crypto/ui/ui_openssl.c
ssl/dtls1.h

index c8d06d6..0fd31e7 100644 (file)
@@ -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>
index bc7d9c5..5b1109d 100644 (file)
  * [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>
index 1bc25f4..fd9c4a8 100644 (file)
  * 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>
index 6317da9..2b1d1e7 100644 (file)
 #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" {