freerdp: fix rdpClientContext duplicate definition
xfreerdp-server: fix build without XFIXES
Merge branch 'master' of git://github.com/awakecoding/FreeRDP

# By Marc-André Moreau
# Via Marc-André Moreau
* 'master' of git://github.com/awakecoding/FreeRDP:
  xfreerdp-server: fix build without XFIXES
  freerdp: fix rdpClientContext duplicate definition