From 80f641c38a73b9113778edba232a671aafaf3c5a Mon Sep 17 00:00:00 2001 From: Emmanuel Ledoux Date: Fri, 4 Jul 2014 17:40:06 +0200 Subject: [PATCH] winpr-comm, serial: excluded Android platforms as well --- channels/serial/client/serial_main.c | 4 ++-- winpr/include/winpr/comm.h | 2 +- winpr/libwinpr/comm/comm.c | 2 +- winpr/libwinpr/comm/comm.h | 2 +- winpr/libwinpr/comm/comm_io.c | 2 +- winpr/libwinpr/comm/comm_ioctl.c | 2 +- winpr/libwinpr/comm/comm_ioctl.h | 2 +- winpr/libwinpr/comm/comm_sercx2_sys.c | 2 +- winpr/libwinpr/comm/comm_sercx2_sys.h | 2 +- winpr/libwinpr/comm/comm_sercx_sys.c | 2 +- winpr/libwinpr/comm/comm_sercx_sys.h | 2 +- winpr/libwinpr/comm/comm_serial_sys.c | 2 +- winpr/libwinpr/comm/comm_serial_sys.h | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/channels/serial/client/serial_main.c b/channels/serial/client/serial_main.c index f92ebf54e..8990ad26a 100644 --- a/channels/serial/client/serial_main.c +++ b/channels/serial/client/serial_main.c @@ -44,7 +44,7 @@ /* TODO: all #ifdef __linux__ could be removed once only some generic * functions will be used. Replace CommReadFile by ReadFile, * CommWriteFile by WriteFile etc.. */ -#ifdef __linux__ +#if defined __linux__ && !defined ANDROID #define MAX_IRP_THREADS 5 @@ -740,7 +740,7 @@ int DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints) char* path; char* driver; RDPDR_SERIAL* device; -#ifdef __linux__ +#if defined __linux__ && !defined ANDROID int i, len; SERIAL_DEVICE* serial; #endif /* __linux__ */ diff --git a/winpr/include/winpr/comm.h b/winpr/include/winpr/comm.h index 1ec4ea786..d7b81a8d1 100644 --- a/winpr/include/winpr/comm.h +++ b/winpr/include/winpr/comm.h @@ -29,7 +29,7 @@ #include -#ifdef __linux__ +#if defined __linux__ && !defined ANDROID #define NOPARITY 0 #define ODDPARITY 1 diff --git a/winpr/libwinpr/comm/comm.c b/winpr/libwinpr/comm/comm.c index f294423c0..93ea80ea4 100644 --- a/winpr/libwinpr/comm/comm.c +++ b/winpr/libwinpr/comm/comm.c @@ -24,7 +24,7 @@ #include "config.h" #endif -#ifdef __linux__ +#if defined __linux__ && !defined ANDROID #include #include diff --git a/winpr/libwinpr/comm/comm.h b/winpr/libwinpr/comm/comm.h index fd4c2dc4e..5531f2d7c 100644 --- a/winpr/libwinpr/comm/comm.h +++ b/winpr/libwinpr/comm/comm.h @@ -21,7 +21,7 @@ #ifndef WINPR_COMM_PRIVATE_H #define WINPR_COMM_PRIVATE_H -#ifdef __linux__ +#if defined __linux__ && !defined ANDROID #include #include diff --git a/winpr/libwinpr/comm/comm_io.c b/winpr/libwinpr/comm/comm_io.c index 9dbbabb1f..c7033a655 100644 --- a/winpr/libwinpr/comm/comm_io.c +++ b/winpr/libwinpr/comm/comm_io.c @@ -21,7 +21,7 @@ #include "config.h" #endif -#ifdef __linux__ +#if defined __linux__ && !defined ANDROID #include #include diff --git a/winpr/libwinpr/comm/comm_ioctl.c b/winpr/libwinpr/comm/comm_ioctl.c index 19ca5f8d9..09c1e0e6e 100644 --- a/winpr/libwinpr/comm/comm_ioctl.c +++ b/winpr/libwinpr/comm/comm_ioctl.c @@ -24,7 +24,7 @@ #include "config.h" #endif -#ifdef __linux__ +#if defined __linux__ && !defined ANDROID #include diff --git a/winpr/libwinpr/comm/comm_ioctl.h b/winpr/libwinpr/comm/comm_ioctl.h index 4953be4a4..8abdc1012 100644 --- a/winpr/libwinpr/comm/comm_ioctl.h +++ b/winpr/libwinpr/comm/comm_ioctl.h @@ -22,7 +22,7 @@ #ifndef WINPR_COMM_IOCTL_H_ #define WINPR_COMM_IOCTL_H_ -#ifdef __linux__ +#if defined __linux__ && !defined ANDROID #include diff --git a/winpr/libwinpr/comm/comm_sercx2_sys.c b/winpr/libwinpr/comm/comm_sercx2_sys.c index b658bfe08..848f79647 100644 --- a/winpr/libwinpr/comm/comm_sercx2_sys.c +++ b/winpr/libwinpr/comm/comm_sercx2_sys.c @@ -20,7 +20,7 @@ * limitations under the License. */ -#ifdef __linux__ +#if defined __linux__ && !defined ANDROID #include diff --git a/winpr/libwinpr/comm/comm_sercx2_sys.h b/winpr/libwinpr/comm/comm_sercx2_sys.h index 2daa8e89c..49e9da672 100644 --- a/winpr/libwinpr/comm/comm_sercx2_sys.h +++ b/winpr/libwinpr/comm/comm_sercx2_sys.h @@ -20,7 +20,7 @@ #ifndef COMM_SERCX2_SYS_H #define COMM_SERCX2_SYS_H -#ifdef __linux__ +#if defined __linux__ && !defined ANDROID #include "comm_ioctl.h" diff --git a/winpr/libwinpr/comm/comm_sercx_sys.c b/winpr/libwinpr/comm/comm_sercx_sys.c index 2c3386f9a..877990c03 100644 --- a/winpr/libwinpr/comm/comm_sercx_sys.c +++ b/winpr/libwinpr/comm/comm_sercx_sys.c @@ -20,7 +20,7 @@ * limitations under the License. */ -#ifdef __linux__ +#if defined __linux__ && !defined ANDROID #include #include diff --git a/winpr/libwinpr/comm/comm_sercx_sys.h b/winpr/libwinpr/comm/comm_sercx_sys.h index 9d0c53b56..2a235743f 100644 --- a/winpr/libwinpr/comm/comm_sercx_sys.h +++ b/winpr/libwinpr/comm/comm_sercx_sys.h @@ -20,7 +20,7 @@ #ifndef COMM_SERCX_SYS_H #define COMM_SERCX_SYS_H -#ifdef __linux__ +#if defined __linux__ && !defined ANDROID #include "comm_ioctl.h" diff --git a/winpr/libwinpr/comm/comm_serial_sys.c b/winpr/libwinpr/comm/comm_serial_sys.c index 9ab53c46c..5ed2b89a5 100644 --- a/winpr/libwinpr/comm/comm_serial_sys.c +++ b/winpr/libwinpr/comm/comm_serial_sys.c @@ -20,7 +20,7 @@ * limitations under the License. */ -#ifdef __linux__ +#if defined __linux__ && !defined ANDROID #include #include diff --git a/winpr/libwinpr/comm/comm_serial_sys.h b/winpr/libwinpr/comm/comm_serial_sys.h index 17bc28c50..bef1fbfe9 100644 --- a/winpr/libwinpr/comm/comm_serial_sys.h +++ b/winpr/libwinpr/comm/comm_serial_sys.h @@ -20,7 +20,7 @@ #ifndef COMM_SERIAL_SYS_H #define COMM_SERIAL_SYS_H -#ifdef __linux__ +#if defined __linux__ && !defined ANDROID #include "comm_ioctl.h"