X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftypes.h;h=6ea71aeba0ed210e5458db15c2523414b03b8a7c;hb=69e00ce68d7e6acf3325adcee8b4a8828fb421d5;hp=acc2c236f35a3f06ba434e90c973015bb9bcaa63;hpb=f6bcc10ce7b517f04eb5cddf01c9ec29ee729b7e;p=rocksndiamonds.git

diff --git a/src/libgame/types.h b/src/libgame/types.h
index acc2c236..6ea71aeb 100644
--- a/src/libgame/types.h
+++ b/src/libgame/types.h
@@ -4,7 +4,7 @@
 // (c) 1995-2014 by Artsoft Entertainment
 //     		    Holger Schemel
 //		    info@artsoft.org
-//		    http://www.artsoft.org/
+//		    https://www.artsoft.org/
 // ----------------------------------------------------------------------------
 // types.h
 // ============================================================================
@@ -18,9 +18,9 @@
 #include <string.h>
 #include <sys/types.h>
 
-typedef int boolean;
 
-#if !defined(PLATFORM_WIN32)
+#if !defined(PLATFORM_WINDOWS)
+typedef int boolean;
 typedef unsigned char byte;
 #endif
 
@@ -41,11 +41,11 @@ typedef unsigned char byte;
 #define AUTO		-1
 
 #ifndef MIN
-#define MIN(a,b) 	((a) < (b) ? (a) : (b))
+#define MIN(a, b) 	((a) < (b) ? (a) : (b))
 #endif
 
 #ifndef MAX
-#define MAX(a,b) 	((a) > (b) ? (a) : (b))
+#define MAX(a, b) 	((a) > (b) ? (a) : (b))
 #endif
 
 #ifndef ABS
@@ -64,8 +64,13 @@ typedef unsigned char byte;
 #define EVEN(a)		(((a) & 1) == 0)
 #endif
 
-#define SIZEOF_ARRAY(array, type)	(sizeof(array) / sizeof(type))
-#define SIZEOF_ARRAY_INT(array)		SIZEOF_ARRAY(array, int)
+#define ARRAY_SIZE(array)		(sizeof(array) / sizeof(array[0]))
+
+#define PTR_TO_INT(p)	((int) (long) (p))
+#define PTR_TO_UINT(p)	((unsigned int) (unsigned long) (p))
+
+#define INT_TO_PTR(i)	((void *) (long) (i))
+#define UINT_TO_PTR(u)	((void *) (unsigned long) (u))
 
 
 struct ListNode
@@ -77,4 +82,11 @@ struct ListNode
 };
 typedef struct ListNode ListNode;
 
-#endif /* TYPES_H */
+struct DelayCounter
+{
+  unsigned int value;
+  unsigned int count;
+};
+typedef struct DelayCounter DelayCounter;
+
+#endif // TYPES_H