projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move all autogenerated header file parts to crypto/opensslconf.h.
[openssl.git]
/
e_os.h
diff --git
a/e_os.h
b/e_os.h
index 3d142ec2ba515c0df3da1a31f2bb2ce93dd32285..eb5c7bf696e4b30309e38b963feec2a0b4dfdaeb 100644
(file)
--- a/
e_os.h
+++ b/
e_os.h
@@
-102,6
+102,9
@@
extern "C" {
#ifdef WIN32
#define get_last_sys_error() GetLastError()
#define clear_sys_error() SetLastError(0)
#ifdef WIN32
#define get_last_sys_error() GetLastError()
#define clear_sys_error() SetLastError(0)
+#if !defined(WINNT)
+#define WIN_CONSOLE_BUG
+#endif
#else
#define get_last_sys_error() errno
#define clear_sys_error() errno=0
#else
#define get_last_sys_error() errno
#define clear_sys_error() errno=0
@@
-110,10
+113,16
@@
extern "C" {
#ifdef WINDOWS
#define get_last_socket_error() WSAGetLastError()
#define clear_socket_error() WSASetLastError(0)
#ifdef WINDOWS
#define get_last_socket_error() WSAGetLastError()
#define clear_socket_error() WSASetLastError(0)
+#define readsocket(s,b,n) recv((s),(b),(n),0)
+#define writesocket(s,b,n) send((s),(b),(n),0)
+#define EADDRINUSE WSAEADDRINUSE
#else
#define get_last_socket_error() errno
#define clear_socket_error() errno=0
#define ioctlsocket(a,b,c) ioctl(a,b,c)
#else
#define get_last_socket_error() errno
#define clear_socket_error() errno=0
#define ioctlsocket(a,b,c) ioctl(a,b,c)
+#define closesocket(s) close(s)
+#define readsocket(s,b,n) read((s),(b),(n))
+#define writesocket(s,b,n) write((s),(b),(n))
#endif
#ifdef WIN16
#endif
#ifdef WIN16
@@
-137,6
+146,12
@@
extern "C" {
#ifndef S_IFMT
#define S_IFMT _S_IFMT
#ifndef S_IFMT
#define S_IFMT _S_IFMT
+
+#if !defined(WINNT)
+#define NO_SYSLOG
+#endif
+#define NO_DIRENT
+
#endif
#define strncasecmp(a,b,c) strnicmp((a),(b),(c))
#endif
#define strncasecmp(a,b,c) strnicmp((a),(b),(c))
@@
-166,7
+181,8
@@
extern "C" {
#ifndef R_OK
# define R_OK 4
#endif
#ifndef R_OK
# define R_OK 4
#endif
-# define SSLEAY_CONF "ssleay.cnf"
+# define OPENSSL_CONF "openssl.cnf"
+# define SSLEAY_CONF OPENSSL_CONF
# define NUL_DEV "nul"
# define RFILE ".rnd"
# define NUL_DEV "nul"
# define RFILE ".rnd"
@@
-178,7
+194,8
@@
extern "C" {
# include <unistd.h>
# endif
# include <unistd.h>
# endif
-# define SSLEAY_CONF "ssleay.cnf"
+# define OPENSSL_CONF "openssl.cnf"
+# define SSLEAY_CONF OPENSSL_CONF
# define RFILE ".rnd"
# define LIST_SEPARATOR_CHAR ':'
# ifndef MONOLITH
# define RFILE ".rnd"
# define LIST_SEPARATOR_CHAR ':'
# ifndef MONOLITH
@@
-251,7
+268,7
@@
extern HINSTANCE _hInstance;
# define SSLeay_Write(a,b,c) write((a),(b),(c))
# define SHUTDOWN(fd) { shutdown((fd),0); close((fd)); }
# define SHUTDOWN2(fd) { shutdown((fd),2); close((fd)); }
# define SSLeay_Write(a,b,c) write((a),(b),(c))
# define SHUTDOWN(fd) { shutdown((fd),0); close((fd)); }
# define SHUTDOWN2(fd) { shutdown((fd),2); close((fd)); }
-# define INVALID_SOCKET
-1
+# define INVALID_SOCKET
(-1)
# endif
#endif
# endif
#endif