[channels,serial] only build on linux

* Guard by CMake
* Remove code #ifdef to ease porting

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()

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);

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

winpr/libwinpr/comm/comm.c

@@ -22,8 +22,6 @@
 
 #include <winpr/config.h>
 
-#if defined __linux__ && !defined ANDROID
-
 #include <winpr/assert.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -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__ */

winpr/libwinpr/comm/comm_io.c

@@ -19,8 +19,6 @@
 
 #include <winpr/config.h>
 
-#if defined __linux__ && !defined ANDROID
-
 #include <winpr/assert.h>
 #include <errno.h>
 #include <termios.h>
@@ -545,5 +543,3 @@ return_false:
 	LeaveCriticalSection(&pComm->WriteLock);
 	return FALSE;
 }
-
-#endif /* __linux__ */

winpr/libwinpr/comm/comm_sercx2_sys.c

@@ -20,8 +20,6 @@
  * limitations under the License.
  */
 
-#if defined __linux__ && !defined ANDROID
-
 #include <winpr/assert.h>
 #include <winpr/wlog.h>
 
@@ -210,5 +208,3 @@ SERIAL_DRIVER* SerCx2Sys_s(void)
 
 	return &SerCx2Sys;
 }
-
-#endif /* __linux__ */

winpr/libwinpr/comm/comm_serial_sys.c

@@ -20,8 +20,6 @@
  * limitations under the License.
  */
 
-#if defined __linux__ && !defined ANDROID
-
 #include <winpr/assert.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -1680,5 +1678,3 @@ SERIAL_DRIVER* SerialSys_s(void)
 {
 	return &SerialSys;
 }
-
-#endif /* __linux__ */