diff options
-rw-r--r-- | e_os.h | 9 | ||||
-rw-r--r-- | include/internal/sockets.h | 45 |
2 files changed, 29 insertions, 25 deletions
@@ -91,7 +91,6 @@ extern "C" { # endif # if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI) -# define NO_SYS_PARAM_H # define NO_CHMOD # define NO_SYSLOG # endif @@ -113,7 +112,6 @@ extern "C" { # endif # ifdef WIN32 -# define NO_SYS_UN_H # undef get_last_sys_error # undef clear_sys_error # define get_last_sys_error() GetLastError() @@ -129,10 +127,6 @@ extern "C" { # ifdef __DJGPP__ # include <unistd.h> # include <sys/stat.h> -# include <sys/socket.h> -# include <sys/un.h> -# include <tcp.h> -# include <netdb.h> # define _setmode setmode # define _O_TEXT O_TEXT # define _O_BINARY O_BINARY @@ -311,9 +305,6 @@ extern FILE *_imp___iob; */ # define EXIT(n) exit((n) ? (((n) << 3) | 2 | 0x10000000 | 0x35a000) : 1) -# define NO_SYS_PARAM_H -# define NO_SYS_UN_H - # define DEFAULT_HOME "SYS$LOGIN:" # else diff --git a/include/internal/sockets.h b/include/internal/sockets.h index c64e74cb50..cc45424a02 100644 --- a/include/internal/sockets.h +++ b/include/internal/sockets.h @@ -10,24 +10,39 @@ #ifndef HEADER_OPENSSL_SOCKETS +# if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI) +# define NO_SYS_PARAM_H +# endif +# ifdef WIN32 +# define NO_SYS_UN_H +# endif +# ifdef OPENSSL_SYS_VMS +# define NO_SYS_PARAM_H +# define NO_SYS_UN_H +# endif + # ifdef OPENSSL_NO_SOCK # elif defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) -# if !defined(__DJGPP__) -# if defined(_WIN32_WCE) && _WIN32_WCE<410 -# define getservbyname _masked_declaration_getservbyname -# endif -# if !defined(IPPROTO_IP) - /* winsock[2].h was included already? */ -# include <winsock.h> -# endif -# ifdef getservbyname +# if defined(__DJGPP__) +# include <sys/socket.h> +# include <sys/un.h> +# include <tcp.h> +# include <netdb.h> +# elif defined(_WIN32_WCE) && _WIN32_WCE<410 +# define getservbyname _masked_declaration_getservbyname +# endif +# if !defined(IPPROTO_IP) + /* winsock[2].h was included already? */ +# include <winsock.h> +# endif +# ifdef getservbyname /* this is used to be wcecompat/include/winsock_extras.h */ -# undef getservbyname +# undef getservbyname struct servent *PASCAL getservbyname(const char *, const char *); -# endif +# endif -# ifdef _WIN64 +# ifdef _WIN64 /* * Even though sizeof(SOCKET) is 8, it's safe to cast it to int, because * the value constitutes an index in per-process table of limited size @@ -35,10 +50,8 @@ struct servent *PASCAL getservbyname(const char *, const char *); * Windows run on happen to be two's-complement, which allows to * interchange INVALID_SOCKET and -1. */ -# define socket(d,t,p) ((int)socket(d,t,p)) -# define accept(s,f,l) ((int)accept(s,f,l)) -# endif -# else +# define socket(d,t,p) ((int)socket(d,t,p)) +# define accept(s,f,l) ((int)accept(s,f,l)) # endif # else |