projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some more tweaks to ENGINE code.
[openssl.git]
/
crypto
/
cryptlib.h
diff --git
a/crypto/cryptlib.h
b/crypto/cryptlib.h
index 1b62a5ae4939c0fe3db2d0f84868f48be1fa2343..a0489e57fc9d9334272f8bdf39bde1bfdf24a335 100644
(file)
--- a/
crypto/cryptlib.h
+++ b/
crypto/cryptlib.h
@@
-62,15
+62,7
@@
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef FLAT_INC
-# include "../e_os.h"
-#else
-# include "e_os.h"
-#endif
+#include "e_os.h"
#include <openssl/crypto.h>
#include <openssl/buffer.h>
#include <openssl/crypto.h>
#include <openssl/buffer.h>
@@
-78,7
+70,11
@@
extern "C" {
#include <openssl/err.h>
#include <openssl/opensslconf.h>
#include <openssl/err.h>
#include <openssl/opensslconf.h>
-#ifndef VMS
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef OPENSSL_SYS_VMS
#define X509_CERT_AREA OPENSSLDIR
#define X509_CERT_DIR OPENSSLDIR "/certs"
#define X509_CERT_FILE OPENSSLDIR "/cert.pem"
#define X509_CERT_AREA OPENSSLDIR
#define X509_CERT_DIR OPENSSLDIR "/certs"
#define X509_CERT_FILE OPENSSLDIR "/cert.pem"