Various cosmetic and consistency fixes.

[libserialport.git] / libserialport_internal.h

diff --git a/libserialport_internal.h b/libserialport_internal.h
index 962fc20833a61d77c344af61a8f09f53c5efb117..d5ce00814fce5470f8d577852785af701131891d 100644 (file)
--- a/libserialport_internal.h
+++ b/libserialport_internal.h
@@ -18,6 +18,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef LIBSERIALPORT_LIBSERIALPORT_INTERNAL_H
+#define LIBSERIALPORT_LIBSERIALPORT_INTERNAL_H
+
+#include "config.h"
+
+#ifdef __linux__
+#define _BSD_SOURCE /* For timeradd, timersub, timercmp. */
+#endif
+
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -32,7 +41,11 @@
 #include <tchar.h>
 #include <setupapi.h>
 #include <cfgmgr32.h>
+#undef DEFINE_GUID
+#define DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
+       static const GUID name = { l,w1,w2,{ b1,b2,b3,b4,b5,b6,b7,b8 } }
 #include <usbioctl.h>
+#include <usbiodef.h>
 #else
 #include <limits.h>
 #include <termios.h>
@@ -70,7 +83,7 @@
 #endif
 
 /* Non-standard baudrates are not available everywhere. */
-#if defined(HAVE_TERMIOS_SPEED) || defined(HAVE_TERMIOS2_SPEED)
+#if (defined(HAVE_TERMIOS_SPEED) || defined(HAVE_TERMIOS2_SPEED)) && defined(HAVE_BOTHER)
 #define USE_TERMIOS_SPEED
 #endif
 
@@ -169,7 +182,7 @@ extern void (*sp_debug_handler)(const char *format, ...);
 #define RETURN() do { \
        DEBUG_FMT("%s returning", __func__); \
        return; \
-} while(0)
+} while (0)
 #define RETURN_CODE(x) do { \
        DEBUG_FMT("%s returning " #x, __func__); \
        return x; \
@@ -219,3 +232,5 @@ SP_PRIV struct sp_port **list_append(struct sp_port **list, const char *portname
 /* OS-specific Helper functions. */
 SP_PRIV enum sp_return get_port_details(struct sp_port *port);
 SP_PRIV enum sp_return list_ports(struct sp_port ***list);
+
+#endif