Merge branch 'master' of github.com:ivan-83/FreeRDP

diff --cc CMakeLists.txt
index ec977dc,dc8569f..1080f34
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -727,14 -706,8 +727,13 @@@ if(BSD
                include_directories(/usr/local/include)
                link_directories(/usr/local/lib)
        endif()
 +      if(OPENBSD)
 +              if(IS_DIRECTORY /usr/X11R6/include)
 +                      include_directories(/usr/X11R6/include)
 +              endif()
 +      endif()
  endif()
  
- 
  if(WITH_CHANNELS)
        add_subdirectory(channels)
  endif()

diff --cc libfreerdp/core/fastpath.c
index 96ea93d,bd65287..9875f17
--- 1/libfreerdp/core/fastpath.c
--- 2/libfreerdp/core/fastpath.c
+++ b/libfreerdp/core/fastpath.c
@@@ -425,7 -424,7 +425,11 @@@ static int fastpath_recv_update_data(rd
                if (fastpath->fragmentation != -1)
                {
                        WLog_ERR(TAG, "Unexpected FASTPATH_FRAGMENT_SINGLE");
++<<<<<<< HEAD
 +                      goto out_fail;
++=======
+                       return -1;
++>>>>>>> d325a3cc4808284cd5db08b547cc40ce1472c117
                }
  
                totalSize = size;
@@@ -433,8 -432,8 +437,13 @@@
  
                if (status < 0)
                {
++<<<<<<< HEAD
 +                      WLog_DBG(TAG, "fastpath_recv_update_data: fastpath_recv_update() - %i", status);
 +                      goto out_fail;
++=======
+                       WLog_DBG(TAG, "fastpath_recv_update() - %i", status);
+                       return -1;
++>>>>>>> d325a3cc4808284cd5db08b547cc40ce1472c117
                }
        }
        else
@@@ -443,8 -442,8 +452,13 @@@
                {
                        if (fastpath->fragmentation != -1)
                        {
++<<<<<<< HEAD
 +                              WLog_ERR(TAG, "fastpath_recv_update_data: Unexpected FASTPATH_FRAGMENT_FIRST");
 +                              goto out_fail;
++=======
+                               WLog_ERR(TAG, "Unexpected FASTPATH_FRAGMENT_FIRST");
+                               return -1;
++>>>>>>> d325a3cc4808284cd5db08b547cc40ce1472c117
                        }
  
                        fastpath->fragmentation = FASTPATH_FRAGMENT_FIRST;
@@@ -470,8 -467,8 +484,13 @@@
                        if ((fastpath->fragmentation != FASTPATH_FRAGMENT_FIRST) &&
                                        (fastpath->fragmentation != FASTPATH_FRAGMENT_NEXT))
                        {
++<<<<<<< HEAD
 +                              WLog_ERR(TAG, "fastpath_recv_update_data: Unexpected FASTPATH_FRAGMENT_NEXT");
 +                              goto out_fail;
++=======
+                               WLog_ERR(TAG, "Unexpected FASTPATH_FRAGMENT_NEXT");
+                               return -1;
++>>>>>>> d325a3cc4808284cd5db08b547cc40ce1472c117
                        }
  
                        fastpath->fragmentation = FASTPATH_FRAGMENT_NEXT;
@@@ -498,8 -491,8 +517,13 @@@
                        if ((fastpath->fragmentation != FASTPATH_FRAGMENT_FIRST) &&
                                        (fastpath->fragmentation != FASTPATH_FRAGMENT_NEXT))
                        {
++<<<<<<< HEAD
 +                              WLog_ERR(TAG, "fastpath_recv_update_data: Unexpected FASTPATH_FRAGMENT_LAST");
 +                              goto out_fail;
++=======
+                               WLog_ERR(TAG, "Unexpected FASTPATH_FRAGMENT_LAST");
+                               return -1;
++>>>>>>> d325a3cc4808284cd5db08b547cc40ce1472c117
                        }
  
                        fastpath->fragmentation = -1;
@@@ -530,8 -519,8 +554,13 @@@
  
                        if (status < 0)
                        {
++<<<<<<< HEAD
 +                              WLog_DBG(TAG, "fastpath_recv_update_data: fastpath_recv_update() - %i", status);
 +                              goto out_fail;
++=======
+                               WLog_DBG(TAG, "fastpath_recv_update() - %i", status);
+                               return -1;
++>>>>>>> d325a3cc4808284cd5db08b547cc40ce1472c117
                        }
                }
        }