Merge remote-tracking branch 'upstream/master'

[16.git] / src / lib / 16_head.h

diff --git a/src/lib/16_head.h b/src/lib/16_head.h
index 3217ea2ed760a07cde59f424e31c3134415776d6..74822da2d4db5b2b87d315b21ad67ac9076e1b20 100755 (executable)
--- a/src/lib/16_head.h
+++ b/src/lib/16_head.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123\r
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -46,10 +46,12 @@
 #include <i86.h>\r
 #include <unistd.h>\r
 #include <alloca.h>\r
+#include <stdint.h> //16_vrs.h\r
 #endif\r
 #include "src/lib/nyan/kitten.h"\r
 #include "src/lib/types.h"\r
 #include "src/lib/typdefst.h"\r
+#include "src/lib/16_in.h"\r
 \r
 #define VERSION __DATE__ " " __TIME__\r
 \r
@@ -153,6 +155,7 @@ extern      int                     profilehandle,debughandle;      //make it into game global
 #define        nil     ((void *)0)\r
 #ifdef __BORLANDC__\r
 #define _FCORELEFT 0x90000UL-16UL\r
+#define sprite\r
 #endif\r
 #ifdef __WATCOMC__\r
 #define _FCORELEFT 0x90000UL+16UL\r
@@ -165,13 +168,6 @@ extern     int                     profilehandle,debughandle;      //make it into game global
 typedef union REGPACK  regs_t;\r
 #endif\r
 \r
-#ifdef __WATCOMC__\r
-typedef void __based(__self) * memptr;\r
-#endif\r
-#ifdef __BORLANDC__\r
-typedef void _seg * memptr;\r
-#endif\r
-\r
 #define INPUT_STATUS_1         0x03da\r
 \r
 /* local function */\r