From c92960e6d71017558a8403b1823dcf98bdb99f39 Mon Sep 17 00:00:00 2001
From: Joshua Granick <jgranick@users.noreply.github.com>
Date: Fri, 22 Jun 2018 14:11:50 -0700
Subject: [PATCH] Compile fix

---
 project/include/hl.h          |  2 +-
 project/include/system/CFFI.h | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/project/include/hl.h b/project/include/hl.h
index fb47080cc..d7c10343b 100644
--- a/project/include/hl.h
+++ b/project/include/hl.h
@@ -235,7 +235,7 @@ typedef uint16_t uchar;
 #include <stdint.h>
 typedef uint16_t char16_t;
 typedef uint32_t char32_t;
-#else
+#elif defined(HL_NATIVE_UCHAR_FUN)
 #	include <uchar.h>
 #endif
 typedef char16_t uchar;
diff --git a/project/include/system/CFFI.h b/project/include/system/CFFI.h
index 0abfcab9b..99cf83de8 100644
--- a/project/include/system/CFFI.h
+++ b/project/include/system/CFFI.h
@@ -5,11 +5,16 @@
 #define HL_NAME(n) hl_##n
 #include <hl.h>
 
-struct hl_varray : varray {};
-struct hl_vstring : vstring {};
+typedef vdynamic hl_vdynamic;
+typedef vobj hl_vobj;
+typedef vvirtual hl_vvirtual;
+typedef varray hl_varray;
+typedef vclosure hl_vclosure;
+typedef vclosure_wrapper hl_vclosure_wrapper;
+typedef vdynobj hl_vdynobj;
+typedef venum hl_venum;
+typedef vstring hl_vstring;
 
-#undef hl_aptr
-#define hl_aptr(a,t)	((t*)(((hl_varray*)(a))+1))
 
 #include <hx/CFFIPrime.h>