Merge branch 'development' into redcode/crythread-2nd-pass

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-08-12 16:47:02 -07:00
parent b32cf24310 8f05c7aa2f
commit f660990e8a
8 changed files with 23 additions and 4 deletions
@@ -226,6 +226,21 @@ typedef uint64 __uint64;

 #define _PTRDIFF_T_DEFINED 1

+typedef union _LARGE_INTEGER
+{
+    struct
+    {
+        DWORD LowPart;
+        LONG HighPart;
+    };
+    struct
+    {
+        DWORD LowPart;
+        LONG HighPart;
+    } u;
+    long long QuadPart;
+} LARGE_INTEGER;
+
 #define _A_RDONLY       (0x01)    /* Read only file */
 #define _A_HIDDEN (0x02)    /* Hidden file */
 #define _A_SUBDIR       (0x10)    /* Subdirectory */
@@ -26,4 +26,6 @@

 typedef uint64_t threadID;

+#define VK_CONTROL  0
+
 #endif // CRYINCLUDE_CRYCOMMON_MACSPECIFIC_H