Changes to PuTTY code that are not needed anymore

Possibly due to newer SDK in BCB11

Source commit: 68efec4dbd06c6bced1491db85a93d7bf399a25f

source/putty/defs.h

@@ -37,7 +37,7 @@
 #define HAVE_AES_NI 1
 #endif
 
-#if (!defined WINSCP) && defined _MSC_VER && _MSC_VER < 1800
+#if defined _MSC_VER && _MSC_VER < 1800
 /* Work around lack of inttypes.h and strtoumax in older MSVC */
 #define PRIx32 "x"
 #define PRIu32 "u"
@@ -50,19 +50,13 @@
 /* Also, define a LEGACY_WINDOWS flag to enable other workarounds */
 #define LEGACY_WINDOWS
 #else
-#ifndef WINSCP
-// Not needed by the code WinSCP uses
 #include <inttypes.h>
-#else
-#define PRIu32 "u"
-#endif
 /* Because we still support older MSVC libraries which don't recognise the
  * standard C "z" modifier for size_t-sized integers, we must use an
  * inttypes.h-style macro for those */
 #define SIZEx "zx"
 #define SIZEu "zu"
 #endif
-uintmax_t strtoumax(const char *nptr, char **endptr, int base);
 
 #if defined __GNUC__ || defined __clang__
 /*

source/putty/windows/network.c

@@ -18,10 +18,6 @@
 #include "tree234.h"
 #include "ssh.h"
 
-#ifdef MPEXT
-// ws2tcpip.h does not compile without _MSC_VER defined
-#define _MSC_VER 1000
-#endif
 #include <ws2tcpip.h>
 
 #if HAVE_AFUNIX_H