X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=e_os.h;h=212a524a15404f09061c061841cdde1a680da6ae;hp=41ab7bb8d1d95d9699a04980d1f3eeec4a27f4a0;hb=812e0c8d68da2f40e216aebc042cec6f38180a28;hpb=37b1f8bd6260ab7d07dcc5c16f2ed88941278e82 diff --git a/e_os.h b/e_os.h index 41ab7bb8d1..212a524a15 100644 --- a/e_os.h +++ b/e_os.h @@ -82,7 +82,7 @@ extern "C" { # if defined(REF_DEBUG) # define REF_ASSERT_ISNT(test) \ - (void)((test) ? (OpenSSLDie(__FILE__, __LINE__, "refcount error"), 1) : 0) + (void)((test) ? (OPENSSL_die("refcount error", __FILE__, __LINE__), 1) : 0) # else # define REF_ASSERT_ISNT(i) # endif @@ -94,6 +94,7 @@ extern "C" { # endif # define osslargused(x) (void)x +# define OPENSSL_CONF "openssl.cnf" # ifndef DEVRANDOM /* @@ -172,25 +173,6 @@ extern "C" { # define closesocket(s) close(s) # define readsocket(s,b,n) read((s),(b),(n)) # define writesocket(s,b,n) write((s),(char *)(b),(n)) -# elif defined(OPENSSL_SYS_NETWARE) -# if defined(NETWARE_BSDSOCK) -# define get_last_socket_error() errno -# define clear_socket_error() errno=0 -# define closesocket(s) close(s) -# define ioctlsocket(a,b,c) ioctl(a,b,c) -# if defined(NETWARE_LIBC) -# define readsocket(s,b,n) recv((s),(b),(n),0) -# define writesocket(s,b,n) send((s),(b),(n),0) -# else -# define readsocket(s,b,n) recv((s),(char*)(b),(n),0) -# define writesocket(s,b,n) send((s),(char*)(b),(n),0) -# endif -# else -# 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) -# endif # else # define get_last_socket_error() errno # define clear_socket_error() errno=0 @@ -337,9 +319,6 @@ extern FILE *_imp___iob; # 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 @@ -369,10 +348,7 @@ extern FILE *_imp___iob; # else # include # endif -# define OPENSSL_CONF "openssl.cnf" -# define RFILE ".rnd" # define LIST_SEPARATOR_CHAR ',' -# define NUL_DEV "NLA0:" /* We don't have any well-defined random devices on VMS, yet... */ # undef DEVRANDOM /*- @@ -404,29 +380,6 @@ extern FILE *_imp___iob; # define NO_SYS_PARAM_H # define NO_SYS_UN_H -# elif defined(OPENSSL_SYS_NETWARE) -# include -# include -# define NO_SYS_TYPES_H -# undef DEVRANDOM -# ifdef NETWARE_CLIB -# define getpid GetThreadID -extern int GetThreadID(void); -/* # include */ -extern int kbhit(void); -# else -# include -# endif -# define NO_SYSLOG -# define _setmode setmode -# 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); } - # else /* !defined VMS */ # ifdef OPENSSL_UNISTD @@ -442,15 +395,10 @@ extern int kbhit(void); # include # endif -# define OPENSSL_CONF "openssl.cnf" -# define RFILE ".rnd" # define LIST_SEPARATOR_CHAR ':' -# define NUL_DEV "/dev/null" # define EXIT(n) exit(n) # endif -# define OpenSSL_getpid() getpid() - # endif /*************/ @@ -460,13 +408,10 @@ extern int kbhit(void); # endif # ifdef USE_SOCKETS -# if defined(WINDOWS) || defined(MSDOS) +# ifdef OPENSSL_NO_SOCK +# elif defined(WINDOWS) || defined(MSDOS) /* windows world */ - -# ifdef OPENSSL_NO_SOCK -# define OpenSSL_Write(a,b,c) (-1) -# define OpenSSL_Read(a,b,c) (-1) -# elif !defined(__DJGPP__) +# if !defined(__DJGPP__) # if defined(_WIN32_WCE) && _WIN32_WCE<410 # define getservbyname _masked_declaration_getservbyname # endif @@ -491,34 +436,8 @@ 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 OpenSSL_Write(a,b,c) send((a),(b),(c),0) -# define OpenSSL_Read(a,b,c) recv((a),(b),(c),0) -# 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) - /* - * NetWare uses the WinSock2 interfaces by default, but can be - * configured for BSD - */ -# if defined(NETWARE_BSDSOCK) -# include -# include -# include -# include -# if defined(NETWARE_CLIB) -# include -# else -# include -# endif -# define INVALID_SOCKET (int)(~0) # else -# include # endif -# define OpenSSL_Write(a,b,c) send((a),(b),(c),0) -# define OpenSSL_Read(a,b,c) recv((a),(b),(c),0) # else @@ -578,8 +497,6 @@ struct servent *PASCAL getservbyname(const char *, const char *); # 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 */ @@ -617,21 +534,6 @@ struct servent *PASCAL getservbyname(const char *, const char *); # define strcasecmp OPENSSL_strcasecmp # define strncasecmp OPENSSL_strncasecmp # define OPENSSL_IMPLEMENTS_strncasecmp -# elif defined(OPENSSL_SYS_OS2) && defined(__EMX__) -# define strcasecmp stricmp -# define strncasecmp strnicmp -# elif defined(OPENSSL_SYS_NETWARE) -# include -# if defined(NETWARE_CLIB) -# define strcasecmp stricmp -# define strncasecmp strnicmp -# endif /* NETWARE_CLIB */ -# endif - -# if defined(OPENSSL_SYS_OS2) && defined(__EMX__) -# include -# include -# define NO_SYSLOG # endif /* vxworks */