X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=e_os.h;h=f44f39300c1dfc6ce722616bf2bef56cea9bd148;hp=948a8bfd7e1b664c5af9fe95b44ee5f7090d9927;hb=5ef67042f9d3514d663b3f6a83aefc98a3cfa85d;hpb=bc596a7418f149be8d5b742154abf5f5366e5b00 diff --git a/e_os.h b/e_os.h index 948a8bfd7e..f44f39300c 100644 --- a/e_os.h +++ b/e_os.h @@ -275,6 +275,9 @@ extern "C" { # define NO_SYS_PARAM_H # else /* !defined VMS */ +# ifdef MPE +# define NO_SYS_PARAM_H +# endif # ifdef OPENSSL_UNISTD # include OPENSSL_UNISTD # else @@ -283,12 +286,16 @@ extern "C" { # ifndef NO_SYS_TYPES_H # include # endif -# ifdef NeXT +# if defined(NeXT) || defined(NEWS4) # define pid_t int /* pid_t is missing on NEXTSTEP/OPENSTEP * (unless when compiling with -D_POSIX_SOURCE, * which doesn't work for us) */ # define ssize_t int /* ditto */ # endif +# ifdef NEWS4 /* setvbuf is missing on mips-sony-bsd */ +# define setvbuf(a, b, c, d) setbuffer((a), (b), (d)) + typedef unsigned long clock_t; +# endif # define OPENSSL_CONF "openssl.cnf" # define SSLEAY_CONF OPENSSL_CONF @@ -340,18 +347,22 @@ extern HINSTANCE _hInstance; # ifndef NO_SYS_PARAM_H # include # endif -# include /* Needed under linux for FD_XXX */ +# ifndef MPE +# include /* Needed under linux for FD_XXX */ +# endif # include # if defined(VMS) && !defined(__DECC) # include # include +# include # else # include # ifdef FILIO_H # include /* Added for FIONBIO under unixware */ # endif # include +# include # endif # if defined(NeXT) || defined(_NEXT_SOURCE) @@ -363,6 +374,10 @@ extern HINSTANCE _hInstance; # include # endif +# ifdef __QNX__ +# include +# endif + # if defined(sun) # include # else @@ -404,7 +419,12 @@ extern HINSTANCE _hInstance; #endif #if defined(sun) && !defined(__svr4__) && !defined(__SVR4) -#define memmove(s1,s2,n) bcopy((s2),(s1),(n)) + /* bcopy can handle overlapping moves according to SunOS 4.1.4 manpage */ +# define memmove(s1,s2,n) bcopy((s2),(s1),(n)) +# define strtoul(s,e,b) ((unsigned long int)strtol((s),(e),(b))) +extern char *sys_errlist[]; extern int sys_nerr; +# define strerror(errnum) \ + (((errnum)<0 || (errnum)>=sys_nerr) ? NULL : sys_errlist[errnum]) #endif /***********************************************/ @@ -430,19 +450,6 @@ extern HINSTANCE _hInstance; #define IRIX_CC_BUG /* CDS++ up to V2.0Bsomething suffered from the same bug.*/ #endif -#ifdef NO_MD2 -#define MD2_Init MD2Init -#define MD2_Update MD2Update -#define MD2_Final MD2Final -#define MD2_DIGEST_LENGTH 16 -#endif -#ifdef NO_MD5 -#define MD5_Init MD5Init -#define MD5_Update MD5Update -#define MD5_Final MD5Final -#define MD5_DIGEST_LENGTH 16 -#endif - #ifdef __cplusplus } #endif