X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=e_os.h;h=bc105fbe69495189ddb90c30db07c835015cd449;hb=ff7ca7a33668d2d23ddef3169dca547fece9138d;hp=6f5edfba2a9dc763f16ab141092bf392bd6dda85;hpb=b317819b2e74f1f84925695596aa3c7487a2264d;p=openssl.git

diff --git a/e_os.h b/e_os.h
index 6f5edfba2a..bc105fbe69 100644
--- a/e_os.h
+++ b/e_os.h
@@ -185,19 +185,6 @@ extern "C" {
 #define writesocket(s,b,n)	write((s),(b),(n))
 #endif
 
-#ifdef WIN16 /* never the case */
-#  define MS_CALLBACK	_far _loadds
-#  define MS_FAR	_far
-#else
-#  define MS_CALLBACK
-#  define MS_FAR
-#endif
-
-#ifdef OPENSSL_NO_STDIO
-#  undef OPENSSL_NO_FP_API
-#  define OPENSSL_NO_FP_API
-#endif
-
 #if (defined(WINDOWS) || defined(MSDOS))
 
 #  ifdef __DJGPP__
@@ -345,11 +332,13 @@ static __inline unsigned int _strlen31(const char *str)
 #    define DEFAULT_HOME  "C:"
 #  endif
 
-/* Avoid Windows 8 SDK GetVersion deprecated problems */
+/* Avoid Visual Studio 13 GetVersion deprecated problems */
 #if defined(_MSC_VER) && _MSC_VER>=1800
 #  define check_winnt() (1)
+#  define check_win_minplat(x) (1)
 #else
 #  define check_winnt() (GetVersion() < 0x80000000)
+#  define check_win_minplat(x) (LOBYTE(LOWORD(GetVersion())) >= (x))
 #endif
 
 #else /* The non-microsoft world */
@@ -371,7 +360,8 @@ static __inline unsigned int _strlen31(const char *str)
 #    define NUL_DEV		"NLA0:"
   /* We don't have any well-defined random devices on VMS, yet... */
 #    undef DEVRANDOM
-  /* We need to do this since VMS has the following coding on status codes:
+  /*-
+     We need to do this since VMS has the following coding on status codes:
 
      Bits 0-2: status type: 0 = warning, 1 = success, 2 = error, 3 = info ...
                The important thing to know is that odd numbers are considered
@@ -421,9 +411,6 @@ static __inline unsigned int _strlen31(const char *str)
 
 #  else
      /* !defined VMS */
-#    ifdef OPENSSL_SYS_MPE
-#      define NO_SYS_PARAM_H
-#    endif
 #    ifdef OPENSSL_UNISTD
 #      include OPENSSL_UNISTD
 #    else
@@ -432,15 +419,6 @@ static __inline unsigned int _strlen31(const char *str)
 #    ifndef NO_SYS_TYPES_H
 #      include <sys/types.h>
 #    endif
-#    if defined(NeXT) || defined(OPENSSL_SYS_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) */
-#    endif
-#    ifdef OPENSSL_SYS_NEWS4 /* setvbuf is missing on mips-sony-bsd */
-#      define setvbuf(a, b, c, d) setbuffer((a), (b), (d))
-       typedef unsigned long clock_t;
-#    endif
 #    ifdef OPENSSL_SYS_WIN32_CYGWIN
 #      include <io.h>
 #      include <fcntl.h>
@@ -536,8 +514,6 @@ static __inline unsigned int _strlen31(const char *str)
 #    endif
 #    ifdef OPENSSL_SYS_VXWORKS
 #      include <time.h> 
-#    elif !defined(OPENSSL_SYS_MPE)
-#      include <sys/time.h> /* Needed under linux for FD_XXX */
 #    endif
 
 #    include <netdb.h>
@@ -564,11 +540,6 @@ static __inline unsigned int _strlen31(const char *str)
 #      include <arpa/inet.h>
 #    endif
 
-#    if defined(NeXT) || defined(_NEXT_SOURCE)
-#      include <sys/fcntl.h>
-#      include <sys/types.h>
-#    endif
-
 #    ifdef OPENSSL_SYS_AIX
 #      include <sys/select.h>
 #    endif
@@ -644,15 +615,6 @@ extern char *sys_errlist[]; extern int sys_nerr;
 
 /***********************************************/
 
-#define DG_GCC_BUG	/* gcc < 2.6.3 on DGUX */
-
-#ifdef sgi
-#define IRIX_CC_BUG	/* all version of IRIX I've tested (4.* 5.*) */
-#endif
-#ifdef OPENSSL_SYS_SNI
-#define IRIX_CC_BUG	/* CDS++ up to V2.0Bsomething suffered from the same bug.*/
-#endif
-
 #if defined(OPENSSL_SYS_WINDOWS)
 #  define strcasecmp _stricmp
 #  define strncasecmp _strnicmp