--- deliantra/server/include/re-cmp.h	2006/08/29 08:01:36	1.2
+++ deliantra/server/include/re-cmp.h	2006/09/08 04:51:18	1.3
@@ -21,24 +21,6 @@
 /*   D o   n o t   c h a n g e    b e l o w
  */
 
-#ifdef uchar
-#    undef uchar
-#endif
-#ifdef Boolean
-#    undef Boolean
-#endif
-#ifdef True
-#    undef True
-#endif
-#ifdef False
-#    undef False
-#endif
-
-#define uchar	unsigned char
-#define Boolean	uchar
-#define True	1	/* Changing this value will break the code */
-#define False	0
-
 typedef enum {
     sel_any, 		/* corresponds to e.g. .		*/
     sel_end,		/*         "           $		*/
@@ -59,11 +41,11 @@
 typedef struct {
     selection_type type;
     union {
-        uchar single;
+        unsigned char single;
         struct {
-            uchar low, high;
+            unsigned char low, high;
         } range;
-        Boolean array[UCHAR_MAX];
+        bool array[UCHAR_MAX];
     } u;
     repetetion_type repeat;
 } selection;