X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fcryptlib.h;h=d26f9630eade8a69e59def9922b84615bfcbbe8c;hp=1b62a5ae4939c0fe3db2d0f84868f48be1fa2343;hb=0bcb17a7776b7f740e855932890edfb7acfd7124;hpb=17e3dd1c62e9aadcd908c55e650f70379d2d19e2;ds=sidebyside

diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h
index 1b62a5ae49..d26f9630ea 100644
--- a/crypto/cryptlib.h
+++ b/crypto/cryptlib.h
@@ -62,14 +62,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
+#include "e_os.h"
 
-#ifndef FLAT_INC
-# include "../e_os.h"
-#else
-# include "e_os.h"
+#ifdef OPENSSL_USE_APPLINK
+#define BIO_FLAGS_UPLINK 0x8000
+#include "ms/uplink.h"
 #endif
 
 #include <openssl/crypto.h>
@@ -78,7 +75,11 @@ extern "C" {
 #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"
@@ -93,6 +94,16 @@ extern "C" {
 #define X509_CERT_DIR_EVP        "SSL_CERT_DIR"
 #define X509_CERT_FILE_EVP       "SSL_CERT_FILE"
 
+/* size of string representations */
+#define DECIMAL_SIZE(type)	((sizeof(type)*8+2)/3+1)
+#define HEX_SIZE(type)		(sizeof(type)*2)
+
+void OPENSSL_cpuid_setup(void);
+extern unsigned int OPENSSL_ia32cap_P[];
+void OPENSSL_showfatal(const char *fmta,...);
+void *OPENSSL_stderr(void);
+extern int OPENSSL_NONPIC_relocated;
+
 #ifdef  __cplusplus
 }
 #endif