diff --git a/channels/serial/client/CMakeLists.txt b/channels/serial/client/CMakeLists.txt index ad7e37973..6549dce22 100644 --- a/channels/serial/client/CMakeLists.txt +++ b/channels/serial/client/CMakeLists.txt @@ -24,4 +24,8 @@ set(${MODULE_PREFIX}_SRCS set(${MODULE_PREFIX}_LIBS winpr freerdp ) -add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry") + +# Serial implementation is currently linux only. BSD* might also work but untested +if (UNIX AND NOT APPLE AND NOT ANDROID) + add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry") +endif() diff --git a/channels/serial/client/serial_main.c b/channels/serial/client/serial_main.c index 810a94a95..556787703 100644 --- a/channels/serial/client/serial_main.c +++ b/channels/serial/client/serial_main.c @@ -44,11 +44,6 @@ #define TAG CHANNELS_TAG("serial.client") -/* TODO: all #ifdef __linux__ could be removed once only some generic - * functions will be used. Replace CommReadFile by ReadFile, - * CommWriteFile by WriteFile etc.. */ -#if defined __linux__ && !defined ANDROID - #define MAX_IRP_THREADS 5 typedef struct @@ -806,8 +801,6 @@ static UINT serial_free(DEVICE* device) return CHANNEL_RC_OK; } -#endif /* __linux__ */ - static void serial_message_free(void* obj) { wMessage* msg = obj; @@ -847,10 +840,8 @@ static void irp_thread_close(void* arg) */ FREERDP_ENTRY_POINT(UINT serial_DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)) { -#if defined __linux__ && !defined ANDROID size_t len = 0; SERIAL_DEVICE* serial = NULL; -#endif /* __linux__ */ UINT error = CHANNEL_RC_OK; WINPR_ASSERT(pEntryPoints); diff --git a/winpr/libwinpr/comm/CMakeLists.txt b/winpr/libwinpr/comm/CMakeLists.txt index cc737418c..1516c4216 100644 --- a/winpr/libwinpr/comm/CMakeLists.txt +++ b/winpr/libwinpr/comm/CMakeLists.txt @@ -18,7 +18,7 @@ set(MODULE_NAME "winpr-comm") set(MODULE_PREFIX "WINPR_COMM") -if(UNIX AND NOT WIN32 AND NOT APPLE) +if(UNIX AND NOT ANDROID AND NOT APPLE) set(${MODULE_PREFIX}_SRCS comm.c comm.h diff --git a/winpr/libwinpr/comm/comm.c b/winpr/libwinpr/comm/comm.c index d3b909f2f..856fbb58f 100644 --- a/winpr/libwinpr/comm/comm.c +++ b/winpr/libwinpr/comm/comm.c @@ -22,8 +22,6 @@ #include -#if defined __linux__ && !defined ANDROID - #include #include #include @@ -1412,5 +1410,3 @@ int eventfd_write(int fd, eventfd_t value) return (write(fd, &value, sizeof(value)) == sizeof(value)) ? 0 : -1; } #endif - -#endif /* __linux__ */ diff --git a/winpr/libwinpr/comm/comm_io.c b/winpr/libwinpr/comm/comm_io.c index a89c45292..3227c706b 100644 --- a/winpr/libwinpr/comm/comm_io.c +++ b/winpr/libwinpr/comm/comm_io.c @@ -19,8 +19,6 @@ #include -#if defined __linux__ && !defined ANDROID - #include #include #include @@ -545,5 +543,3 @@ return_false: LeaveCriticalSection(&pComm->WriteLock); return FALSE; } - -#endif /* __linux__ */ diff --git a/winpr/libwinpr/comm/comm_sercx2_sys.c b/winpr/libwinpr/comm/comm_sercx2_sys.c index dd2df8ee8..e036c47e7 100644 --- a/winpr/libwinpr/comm/comm_sercx2_sys.c +++ b/winpr/libwinpr/comm/comm_sercx2_sys.c @@ -20,8 +20,6 @@ * limitations under the License. */ -#if defined __linux__ && !defined ANDROID - #include #include @@ -210,5 +208,3 @@ SERIAL_DRIVER* SerCx2Sys_s(void) return &SerCx2Sys; } - -#endif /* __linux__ */ diff --git a/winpr/libwinpr/comm/comm_serial_sys.c b/winpr/libwinpr/comm/comm_serial_sys.c index e1125a0e3..670fdb03c 100644 --- a/winpr/libwinpr/comm/comm_serial_sys.c +++ b/winpr/libwinpr/comm/comm_serial_sys.c @@ -20,8 +20,6 @@ * limitations under the License. */ -#if defined __linux__ && !defined ANDROID - #include #include #include @@ -1680,5 +1678,3 @@ SERIAL_DRIVER* SerialSys_s(void) { return &SerialSys; } - -#endif /* __linux__ */