Compatibility commit

* Adds compatibility defines for 2.2.0
* Reorders some newe fields in structs to improve compatibility

diff --git a/include/freerdp/gdi/gdi.h b/include/freerdp/gdi/gdi.h
index 790f5df..7c5fc56 100644 (file)
--- a/include/freerdp/gdi/gdi.h
+++ b/include/freerdp/gdi/gdi.h
@@ -520,12 +520,12 @@ struct rdp_gdi
        BOOL graphicsReset; /* deprecated, remove with FreeRDP v3 */
        BOOL suppressOutput;
        UINT16 outputSurfaceId;
-       UINT32 frameId;
        RdpgfxClientContext* gfx;
        VideoClientContext* video;
        GeometryClientContext* geometry;
 
        wLog* log;
+       UINT32 frameId;
 };
 
 #ifdef __cplusplus

diff --git a/include/freerdp/settings.h b/include/freerdp/settings.h
index 1c27b55..cc89579 100644 (file)
--- a/include/freerdp/settings.h
+++ b/include/freerdp/settings.h
@@ -120,6 +120,7 @@ typedef enum
 #define RNS_UD_CS_STRONG_ASYMMETRIC_KEYS 0x0008
 #define RNS_UD_CS_VALID_CONNECTION_TYPE 0x0020
 #define RNS_UD_CS_SUPPORT_MONITOR_LAYOUT_PDU 0x0040
+#define RNS_UD_CS_SUPPORT_NETWORK_AUTODETECT 0x0080 /* DEPRECATED: Compatibility define */
 #define RNS_UD_CS_SUPPORT_NETCHAR_AUTODETECT 0x0080
 #define RNS_UD_CS_SUPPORT_DYNVC_GFX_PROTOCOL 0x0100
 #define RNS_UD_CS_SUPPORT_DYNAMIC_TIME_ZONE 0x0200