summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2010-10-01 22:54:10 +0000
committerDamien Miller <djm@cvs.openbsd.org>2010-10-01 22:54:10 +0000
commitc8a1e5f3581b6bad5e4e4c911ec1fc909af5fc47 (patch)
tree78b397b4ec5ed78a6cf07fc2f7a256da07d7d321
parentae67461d4efb5efd04649731b1e7f87f02e53b48 (diff)
import OpenSSL-1.0.0a
-rw-r--r--lib/libssl/src/crypto/pkcs7/bio_pk7.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libssl/src/crypto/pkcs7/bio_pk7.c b/lib/libssl/src/crypto/pkcs7/bio_pk7.c
index 0fd31e730ff..c8d06d6cdc8 100644
--- a/lib/libssl/src/crypto/pkcs7/bio_pk7.c
+++ b/lib/libssl/src/crypto/pkcs7/bio_pk7.c
@@ -56,7 +56,7 @@
#include <openssl/pkcs7.h>
#include <openssl/bio.h>
-#if !defined(OPENSSL_SYSNAME_NETWARE) && !defined(OPENSSL_SYSNAME_VXWORKS)
+#ifndef OPENSSL_SYSNAME_NETWARE
#include <memory.h>
#endif
#include <stdio.h>