Commit b2db9c18 authored Aug 25, 2017 by Rich Salz

MSC_VER <= 1200 isn't supported; remove dead code



VisualStudio 6 and earlier aren't supported.

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4263)

parent 32c13563

CHANGES

+4 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,10 @@

		Changes between 1.1.0f and 1.1.1 [xx XXX xxxx]

		*) Some macro definitions to support VS6 have been removed. Visual
		Studio 6 has not worked since 1.1.0
		[Rich Salz]

		*) Add ERR_clear_last_mark(), to allow callers to clear the last mark
		without clearing the errors.
		[Richard Levitte]

crypto/sha/sha512.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -399,9 +399,6 @@ static SHA_LONG64 __fastcall __pull64be(const void *x)
		}
		# endif
		# define PULL64(x) __pull64be(&(x))
		# if _MSC_VER<=1200
		# pragma inline_depth(0)
		# endif
		# endif
		# endif
		# endif

e_os.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -196,14 +196,6 @@ static __inline unsigned int _strlen31(const char *str)
		}
		# endif
		# include <malloc.h>
		# if defined(_MSC_VER) && _MSC_VER<=1200 && defined(_MT) && defined(isspace)
		/* compensate for bug in VC6 ctype.h */
		# undef isspace
		# undef isdigit
		# undef isalnum
		# undef isupper
		# undef isxdigit
		# endif
		# if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(_DLL) && defined(stdin)
		# if _MSC_VER>=1300 && _MSC_VER<1600
		# undef stdin

test/ectest.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -23,11 +23,6 @@
		# include <openssl/bn.h>
		# include <openssl/opensslconf.h>

		# if defined(_MSC_VER) && defined(_MIPS_) && (_MSC_VER/100==12)
		/* suppress "too big too optimize" warning */
		# pragma warning(disable:4959)
		# endif

		static size_t crv_len = 0;
		static EC_builtin_curve *curves = NULL;