Merge remote-tracking branch 'upstream/master'

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

diff --git a/src/lib/types.h b/src/lib/types.h
old mode 100644 (file)
new mode 100755 (executable)
index 66606fc..884aaea
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -1,34 +1,63 @@
-/* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
- *
- * This file is part of Project 16.
- *
- * Project 16 is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Project 16 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>, or
- * write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
+/* Project 16 Source Code~\r
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ *\r
+ * This file is part of Project 16.\r
+ *\r
+ * Project 16 is free software; you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation; either version 3 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * Project 16 is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>, or\r
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,\r
+ * Fifth Floor, Boston, MA 02110-1301 USA.\r
+ *\r
+ */\r
 /*\r
  * Just some handy typedefs that make it easier to think about the low\r
  * level code\r
  */\r
 \r
+#ifndef _TYPE_H_\r
+#define _TYPE_H_\r
+\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
-
-//typedef      enum    {FALSE,TRUE}    boolean;
+\r
+typedef unsigned int iword;\r
+typedef signed int siword;\r
+\r
+typedef unsigned long int diword;\r
+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