Use O_CLOEXEC where available

[libserialport.git] / libserialport_internal.h

diff --git a/libserialport_internal.h b/libserialport_internal.h
index a5fc7bc54bcebdcc639a9dbdf8470461eb612143..d784472bb12d0c218413d645ff38e3dec8588da3 100644 (file)
--- a/libserialport_internal.h
+++ b/libserialport_internal.h
@@ -23,7 +23,9 @@
 
 
 #ifdef __linux__
-#define _BSD_SOURCE /* For timeradd, timersub, timercmp. */
+/* For timeradd, timersub, timercmp, realpath. */
+#define _BSD_SOURCE 1 /* for glibc < 2.19 */
+#define _DEFAULT_SOURCE 1 /* for glibc >= 2.20 */
 #endif
 
 #include <string.h>
@@ -45,12 +47,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__
@@ -59,6 +62,7 @@
 #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>
@@ -81,8 +85,18 @@
 #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)) && defined(HAVE_DECL_BOTHER)
+#if (defined(HAVE_TERMIOS_SPEED) || defined(HAVE_TERMIOS2_SPEED)) && HAVE_DECL_BOTHER
 #define USE_TERMIOS_SPEED
 #endif
 
@@ -106,7 +120,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