fix a define conflict with freerdp

common/xrdp_constants.h

@@ -329,10 +329,16 @@
 #define WAVE_FORMAT_MULAW              7
 
 /* Virtual channel options */
-#define CHANNEL_OPTION_INITIALIZED     0x80000000
+#define XR_CHANNEL_OPTION_SHOW_PROTOCOL 0x00200000
-#define CHANNEL_OPTION_ENCRYPT_RDP     0x40000000
+#define XR_CHANNEL_OPTION_COMPRESS      0x00400000
-#define CHANNEL_OPTION_COMPRESS_RDP    0x00800000
+#define XR_CHANNEL_OPTION_COMPRESS_RDP  0x00800000
-#define CHANNEL_OPTION_SHOW_PROTOCOL   0x00200000
+#define XR_CHANNEL_OPTION_PRI_LOW       0x02000000
+#define XR_CHANNEL_OPTION_PRI_MED       0x04000000
+#define XR_CHANNEL_OPTION_PRI_HIGH      0x08000000
+#define XR_CHANNEL_OPTION_ENCRYPT_CS    0x10000000
+#define XR_CHANNEL_OPTION_ENCRYPT_SC    0x20000000
+#define XR_CHANNEL_OPTION_ENCRYPT_RDP   0x40000000
+#define XR_CHANNEL_OPTION_INITIALIZED   0x80000000
 
 /* NT status codes for RDPDR */
 #define STATUS_SUCCESS                 0x00000000
@@ -417,6 +423,7 @@
 #define RDP_ORDER_RAW_BMPCACHE2 4
 #define RDP_ORDER_BMPCACHE2     5
 #define RDP_ORDER_BRUSHCACHE    7
+#define RDP_ORDER_BMPCACHE3     8
 
 /* drawable types */
 #define WND_TYPE_BITMAP  0

libxrdp/xrdp_channel.c

@@ -100,7 +100,7 @@ xrdp_channel_send(struct xrdp_channel* self, struct stream* s, int channel_id,
   }
   s_pop_layer(s, channel_hdr);
   out_uint32_le(s, total_data_len);
-  if (channel->flags & CHANNEL_OPTION_SHOW_PROTOCOL)
+  if (channel->flags & XR_CHANNEL_OPTION_SHOW_PROTOCOL)
   {
     flags |= CHANNEL_FLAG_SHOW_PROTOCOL;
   }