More generic solution for limiting per-call timeout.

[libserialport.git] / libserialport_internal.h

diff --git a/libserialport_internal.h b/libserialport_internal.h
index 83f0090bb5f0b7438c2ce013d9bc1a579042fcc5..d5c9ae5343bd2a12f3e63ebb26a28750b284af18 100644 (file)
--- a/libserialport_internal.h
+++ b/libserialport_internal.h
@@ -26,6 +26,8 @@
 /* For timeradd, timersub, timercmp, realpath. */
 #define _BSD_SOURCE 1 /* for glibc < 2.19 */
 #define _DEFAULT_SOURCE 1 /* for glibc >= 2.20 */
+/* For clock_gettime and associated types. */
+#define _POSIX_C_SOURCE 199309L
 #endif
 
 #include <string.h>
@@ -37,7 +39,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdarg.h>
-#include <limits.h>
+#include <stdbool.h>
 #ifdef _WIN32
 #include <windows.h>
 #include <tchar.h>
@@ -48,12 +50,13 @@
        static const GUID name = { l,w1,w2,{ b1,b2,b3,b4,b5,b6,b7,b8 } }
 #include <usbioctl.h>
 #include <usbiodef.h>
+#include "windows_ddk.h"
 #else
 #include <limits.h>
 #include <termios.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
-#include <limits.h>
+#include <time.h>
 #include <poll.h>
 #endif
 #ifdef __APPLE__
@@ -62,11 +65,13 @@
 #include <IOKit/serial/IOSerialKeys.h>
 #include <IOKit/serial/ioss.h>
 #include <sys/syslimits.h>
+#include <mach/mach_time.h>
 #endif
 #ifdef __linux__
 #include <dirent.h>
-#ifndef __ANDROID__
-#include "linux/serial.h"
+/* Android only has linux/serial.h from platform 21 onwards. */
+#if !(defined(__ANDROID__) && (__ANDROID_API__ < 21))
+#include <linux/serial.h>
 #endif
 #include "linux_termios.h"
 
@@ -84,6 +89,16 @@
 #define TIOCOUTQ FIONWRITE
 #endif
 
+/*
+ * O_CLOEXEC is not available everywhere, fallback to not setting the
+ * flag on those systems.
+ */
+#ifndef _WIN32
+#ifndef O_CLOEXEC
+#define O_CLOEXEC 0
+#endif
+#endif
+
 /* Non-standard baudrates are not available everywhere. */
 #if (defined(HAVE_TERMIOS_SPEED) || defined(HAVE_TERMIOS2_SPEED)) && HAVE_DECL_BOTHER
 #define USE_TERMIOS_SPEED
@@ -109,7 +124,8 @@ struct sp_port {
        OVERLAPPED read_ovl;
        OVERLAPPED wait_ovl;
        DWORD events;
-       BYTE pending_byte;
+       BYTE *write_buf;
+       DWORD write_buf_size;
        BOOL writing;
        BOOL wait_running;
 #else