2 files changed, 5 insertions, 28 deletions
diff --git a/Private/CRT/__cxxkit_cookie.asm b/Private/CRT/__cxxkit_cookie.asm
deleted file mode 100644
index 9e2292fa..00000000
--- a/Private/CRT/__cxxkit_cookie.asm
+++ /dev/null
@@ -1,23 +0,0 @@
-[bits 64]
-[global runtime_cookie_check]
-
-%define LIBALLOC_COOKIE 0x77ccdd
-
-runtime_cookie_check:
-    ret
-
-runtime_cookie_install:
-    push LIBALLOC_COOKIE ;; the cookie
-    jmp rdi
-    cmp rsp, LIBALLOC_COOKIE
-    jne _runtime_cookie_fail
-    ret
-
-_runtime_cookie_fail:
-    mov rsi, 1
-    mov rdi, 33
-    syscall
-
-;; we shouldn't get here if the host has exit (rsi = 1) implemented.
-L0:
-    jmp $
-\ No newline at end of file
diff --git a/Private/CRT/__cxxkit_defines.h b/Private/CRT/__cxxkit_defines.h
index 9726bf18..b36e9ba0 100644
--- a/Private/CRT/__cxxkit_defines.h
+++ b/Private/CRT/__cxxkit_defines.h
@@ -7,8 +7,8 @@
  * 	========================================================
  */
 
-#ifndef __CXKIT_DEF_H
-#define __CXKIT_DEF_H
+#ifndef __CXKIT_DEF__
+#define __CXKIT_DEF__
 
 typedef __SIZE_TYPE__ size_t;
 
@@ -66,7 +66,7 @@ typedef char *caddr_t;
 typedef long long off_t;
 typedef unsigned long long uoff_t;
 
-typedef union {
+typedef union float_cast {
     struct
     {
         unsigned int mantissa : 23;
@@ -77,7 +77,7 @@ typedef union {
     float f;
 } __attribute__((packed)) float_cast_t;
 
-typedef union {
+typedef union double_cast {
     struct
     {
         unsigned long long int mantissa : 52;
@@ -88,4 +88,4 @@ typedef union {
     double f;
 } __attribute__((packed)) double_cast_t;
 
-#endif /* __CXKIT_DEF_H */
+#endif /* __CXKIT_DEF__ */