freerdp: fix build with uclibc snapshot and uclibc-ng

From be615daf41b4bcc61322a987088ee209b5e66c19 Mon Sep 17 00:00:00 2001

From 39ac68abaff0d7b59cbe80036aac37f41ad976ec Mon Sep 17 00:00:00 2001

From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

Date: Wed, 24 Sep 2014 13:54:15 +0100

Subject: [PATCH] Add support for uClibc

  https://github.com/FreeRDP/FreeRDP/commit/5f9c36da5d5cd3c5dce49f7b32fe011cb293f9ec/

To support newer versions of uClibc and uclibc-ng this patch also includes a

backported version of upstream commit 3b7d3190a16c (Fix build with newer

uclibc versions, 2015-04-28)

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

[baruch: merge in upstream commit 3b7d3190a16c]

Signed-off-by: Baruch Siach <baruch@tkos.co.il>

---

 CMakeLists.txt                     |  3 +++

 channels/drive/client/drive_file.c | 12 +++++++++---

 config.h.in                        |  1 +

 winpr/libwinpr/synch/event.c       | 14 ++++++++++++++

 2 files changed, 23 insertions(+), 3 deletions(-)

 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt

index 375e2d1b6845..5b7887601aa0 100755

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -276,6 +276,9 @@ endif()

 if(UNIX OR CYGWIN)

 	check_include_files(sys/eventfd.h HAVE_EVENTFD_H)

+	if (HAVE_EVENTFD_H)

+		check_symbol_exists(eventfd_read sys/eventfd.h WITH_EVENTFD_READ_WRITE)

+	endif()

 	set(X11_FEATURE_TYPE "RECOMMENDED")

 else()

 	set(X11_FEATURE_TYPE "DISABLED")

diff --git a/channels/drive/client/drive_file.c b/channels/drive/client/drive_file.c

index 376b4fe..b20f408 100644

index 376b4fe74be7..b20f408aa356 100644

--- a/channels/drive/client/drive_file.c

+++ b/channels/drive/client/drive_file.c

@@ -480,7 +480,11 @@ BOOL drive_file_set_information(DRIVE_FILE* file, UINT32 FsInformationClass, UIN

 #endif

 			if (FileAttributes > 0)

diff --git a/config.h.in b/config.h.in

index 2b8ec09c2afb..55c595d0e162 100755

--- a/config.h.in

+++ b/config.h.in

@@ -33,6 +33,7 @@

 #cmakedefine WITH_JPEG

 #cmakedefine WITH_WIN8

 #cmakedefine WITH_RDPSND_DSOUND

+#cmakedefine WITH_EVENTFD_READ_WRITE

 /* Plugins */

 #cmakedefine STATIC_CHANNELS

diff --git a/winpr/libwinpr/synch/event.c b/winpr/libwinpr/synch/event.c

index 173afaf..943cccb 100644

index 173afafb7cc9..cb3f338178d9 100644

--- a/winpr/libwinpr/synch/event.c

+++ b/winpr/libwinpr/synch/event.c

@@ -115,6 +115,20 @@ HANDLE OpenEventA(DWORD dwDesiredAccess, BOOL bInheritHandle, LPCSTR lpName)

 }

+#ifdef HAVE_EVENTFD_H

+#if defined(__UCLIBC__)

+#if !defined(WITH_EVENTFD_READ_WRITE)

+static int eventfd_read(int fd, eventfd_t* value)

+{

+	return (read(fd, value, sizeof(*value)) == sizeof(*value)) ? 0 : -1;