Merge remote-tracking branch 'upstream/master'

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

diff --git a/src/lib/types.h b/src/lib/types.h
index 6929124897f6869214fc957f2a3a003ccb1320b7..884aaea956fa090d1e9920804b0a8629388e696b 100755 (executable)
--- a/src/lib/types.h
+++ b/src/lib/types.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
@@ -29,7 +29,7 @@
 \r
 typedef unsigned char byte;\r
 typedef unsigned short word;\r
-typedef unsigned long  dword;\r
+typedef unsigned long dword;\r
 typedef signed char sbyte;\r
 typedef signed short sword;\r
 typedef signed long sdword;\r
@@ -41,5 +41,23 @@ typedef unsigned long int diword;
 typedef signed long int sdiword;\r
 \r
 typedef        enum    {false,true}    boolean;\r
+/*typedef unsigned memseg;\r
+\r
+memptr should be replaced by memseg in code.\r
+\r
+on usage where you need pointer convert memseg type (segment) to far pointer by\r
+MK_FP(segment value, 0)*/\r
+#ifdef __WATCOMC__\r
+typedef void __based( void ) * memptr; ////old //----typedef void __based(__self) * memptr;\r
+typedef unsigned short _seg; // it will contains segment value (as Borland _seg)\r
+#define __SEGA __segment\r
+#endif\r
+#ifdef __BORLANDC__\r
+typedef void _seg * memptr;\r
+#define __SEGA _seg\r
+#endif\r
+\r
+#define _argv __argv\r
+#define _argc __argc\r
 \r
 #endif/*_TYPE_H_*/\r