winpr: more Win32 fixes

winpr/include/winpr/interlocked.h

@@ -158,7 +158,7 @@ WINPR_API PVOID InterlockedCompareExchangePointer(PVOID volatile *Destination, P
 
 #endif /* _WIN32 */
 
-#if (!defined(_WIN32) || (defined(_WIN32) && (_WIN32_WINNT < 0x0502)))
+#if (!defined(_WIN32) || (defined(_WIN32) && !defined(_M_AMD64) && (_WIN32_WINNT < 0x0502)))
 #define WINPR_INTERLOCKED_COMPARE_EXCHANGE64	1
 #endif
 

winpr/libwinpr/file/file.c

@@ -228,9 +228,13 @@ BOOL SetStdHandleEx(DWORD dwStdHandle, HANDLE hNewHandle, HANDLE* phOldHandle)
 
 /* Extended API */
 
+#ifdef _WIN32
+#include <io.h>
+#endif
+
 HANDLE GetFileHandleForFileDescriptor(int fd)
 {
-#ifdef WIN32
+#ifdef _WIN32
 	return (HANDLE)_get_osfhandle(fd);
 #else /* WIN32 */
 	WINPR_FILE *pFile;

winpr/libwinpr/pool/pool.c

@@ -205,9 +205,9 @@ PTP_POOL CreateThreadpool(PVOID reserved)
 		free(pool);
 		return NULL;
 	}
+#endif
 
 	return pool;
-#endif
 }
 
 VOID CloseThreadpool(PTP_POOL ptpp)