projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Travis: build tests in BUILDONLY mode
[openssl.git]
/
e_os.h
diff --git
a/e_os.h
b/e_os.h
index 870c7a7e222ee0c2b18750f63d5b54cb4201db26..02c1ffd7a2df90063e1dfd5cc51ac623408819a6 100644
(file)
--- a/
e_os.h
+++ b/
e_os.h
@@
-82,7
+82,7
@@
extern "C" {
# if defined(REF_DEBUG)
# define REF_ASSERT_ISNT(test) \
# if defined(REF_DEBUG)
# define REF_ASSERT_ISNT(test) \
- (void)((test) ? (O
penSSLDie(__FILE__, __LINE__, "refcount error"
), 1) : 0)
+ (void)((test) ? (O
PENSSL_die("refcount error", __FILE__, __LINE__
), 1) : 0)
# else
# define REF_ASSERT_ISNT(i)
# endif
# else
# define REF_ASSERT_ISNT(i)
# endif
@@
-94,6
+94,7
@@
extern "C" {
# endif
# define osslargused(x) (void)x
# endif
# define osslargused(x) (void)x
+# define OPENSSL_CONF "openssl.cnf"
# ifndef DEVRANDOM
/*
# ifndef DEVRANDOM
/*
@@
-337,9
+338,6
@@
extern FILE *_imp___iob;
# ifndef R_OK
# define R_OK 4
# endif
# ifndef R_OK
# define R_OK 4
# endif
-# define OPENSSL_CONF "openssl.cnf"
-# define NUL_DEV "nul"
-# define RFILE ".rnd"
# ifdef OPENSSL_SYS_WINCE
# define DEFAULT_HOME ""
# else
# ifdef OPENSSL_SYS_WINCE
# define DEFAULT_HOME ""
# else
@@
-369,10
+367,7
@@
extern FILE *_imp___iob;
# else
# include <unixlib.h>
# endif
# else
# include <unixlib.h>
# endif
-# define OPENSSL_CONF "openssl.cnf"
-# define RFILE ".rnd"
# define LIST_SEPARATOR_CHAR ','
# define LIST_SEPARATOR_CHAR ','
-# define NUL_DEV "NLA0:"
/* We don't have any well-defined random devices on VMS, yet... */
# undef DEVRANDOM
/*-
/* We don't have any well-defined random devices on VMS, yet... */
# undef DEVRANDOM
/*-
@@
-422,8
+417,6
@@
extern int kbhit(void);
# define _kbhit kbhit
# define _O_TEXT O_TEXT
# define _O_BINARY O_BINARY
# define _kbhit kbhit
# define _O_TEXT O_TEXT
# define _O_BINARY O_BINARY
-# define OPENSSL_CONF "openssl.cnf"
-# define RFILE ".rnd"
# define LIST_SEPARATOR_CHAR ';'
# define EXIT(n) { if (n) printf("ERROR: %d\n", (int)n); exit(n); }
# define LIST_SEPARATOR_CHAR ';'
# define EXIT(n) { if (n) printf("ERROR: %d\n", (int)n); exit(n); }
@@
-442,15
+435,10
@@
extern int kbhit(void);
# include <fcntl.h>
# endif
# include <fcntl.h>
# endif
-# define OPENSSL_CONF "openssl.cnf"
-# define RFILE ".rnd"
# define LIST_SEPARATOR_CHAR ':'
# define LIST_SEPARATOR_CHAR ':'
-# define NUL_DEV "/dev/null"
# define EXIT(n) exit(n)
# endif
# define EXIT(n) exit(n)
# endif
-# define OpenSSL_getpid() getpid()
-
# endif
/*************/
# endif
/*************/
@@
-461,9
+449,9
@@
extern int kbhit(void);
# ifdef USE_SOCKETS
# ifdef OPENSSL_NO_SOCK
# ifdef USE_SOCKETS
# ifdef OPENSSL_NO_SOCK
-#
define OpenSSL_Write(a,b,c) (-1
)
-# define OpenSSL_Read(a,b,c) (-1)
-#
el
if !defined(__DJGPP__)
+#
elif defined(WINDOWS) || defined(MSDOS
)
+ /* windows world */
+# if !defined(__DJGPP__)
# if defined(_WIN32_WCE) && _WIN32_WCE<410
# define getservbyname _masked_declaration_getservbyname
# endif
# if defined(_WIN32_WCE) && _WIN32_WCE<410
# define getservbyname _masked_declaration_getservbyname
# endif
@@
-488,11
+476,7
@@
struct servent *PASCAL getservbyname(const char *, const char *);
# define socket(d,t,p) ((int)socket(d,t,p))
# define accept(s,f,l) ((int)accept(s,f,l))
# endif
# define socket(d,t,p) ((int)socket(d,t,p))
# define accept(s,f,l) ((int)accept(s,f,l))
# endif
-# define OpenSSL_Write(a,b,c) send((a),(b),(c),0)
-# define OpenSSL_Read(a,b,c) recv((a),(b),(c),0)
# else
# else
-# define OpenSSL_Write(a,b,c) write_s(a,b,c,0)
-# define OpenSSL_Read(a,b,c) read_s(a,b,c)
# endif
# elif defined(OPENSSL_SYS_NETWARE)
# endif
# elif defined(OPENSSL_SYS_NETWARE)
@@
-514,8
+498,6
@@
struct servent *PASCAL getservbyname(const char *, const char *);
# else
# include <novsock2.h>
# endif
# else
# include <novsock2.h>
# endif
-# define OpenSSL_Write(a,b,c) send((a),(b),(c),0)
-# define OpenSSL_Read(a,b,c) recv((a),(b),(c),0)
# else
# else
@@
-575,8
+557,6
@@
struct servent *PASCAL getservbyname(const char *, const char *);
# endif
# endif
# endif
# endif
-# define OpenSSL_Read(a,b,c) read((a),(b),(c))
-# define OpenSSL_Write(a,b,c) write((a),(b),(c))
# ifndef INVALID_SOCKET
# define INVALID_SOCKET (-1)
# endif /* INVALID_SOCKET */
# ifndef INVALID_SOCKET
# define INVALID_SOCKET (-1)
# endif /* INVALID_SOCKET */