[vlc-commits] rdp: Fix build with FreeRDP 2.0.0.

[Vinson Lee]

vlc | branch: master | Vinson Lee <vlee at freedesktop.org> | Tue Dec  1 02:06:19 2015 -0800| [fa5081cc9166dc911eef21182906391105daa670] | committer: Jean-Baptiste Kempf

rdp: Fix build with FreeRDP 2.0.0.

Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fa5081cc9166dc911eef21182906391105daa670
---

 modules/access/rdp.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/access/rdp.c b/modules/access/rdp.c
index d9d05a2..e20cb14 100644
--- a/modules/access/rdp.c
+++ b/modules/access/rdp.c
@@ -46,7 +46,7 @@
 #endif
 
 #if !defined(FREERDP_VERSION_MAJOR) || \
-    (defined(FREERDP_VERSION_MAJOR) && !(FREERDP_VERSION_MAJOR >= 1 && FREERDP_VERSION_MINOR >= 1 ))
+    (defined(FREERDP_VERSION_MAJOR) && !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1)))
 # define SoftwareGdi sw_gdi
 # define Fullscreen fullscreen
 # define ServerHostname hostname
@@ -237,7 +237,7 @@ static bool postConnectHandler( freerdp *p_instance )
     vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_instance->context;
 
     msg_Dbg( p_vlccontext->p_demux, "connected to desktop %dx%d (%d bpp)",
-#if defined(FREERDP_VERSION_MAJOR)  && (FREERDP_VERSION_MAJOR >= 1 && FREERDP_VERSION_MINOR >= 1 )
+#if defined(FREERDP_VERSION_MAJOR) && (FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1))
              p_instance->settings->DesktopWidth,
              p_instance->settings->DesktopHeight,
              p_instance->settings->ColorDepth