X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=libserialport_internal.h;h=5db81e5ba4b0782c22e448e89288104099618be5;hb=962143bc5c3a9a6e130cc1273ab465238c178d70;hp=6a8c877262720f179a543151fa1ff7b41ba00f5e;hpb=e019e72ec0bb04cb52d6b14810485ea8d96a97ee;p=libserialport.git

diff --git a/libserialport_internal.h b/libserialport_internal.h
index 6a8c877..5db81e5 100644
--- a/libserialport_internal.h
+++ b/libserialport_internal.h
@@ -21,7 +21,7 @@
 #ifndef LIBSERIALPORT_LIBSERIALPORT_INTERNAL_H
 #define LIBSERIALPORT_LIBSERIALPORT_INTERNAL_H
 
-#include "config.h"
+#include <config.h>
 
 #ifdef __linux__
 #define _BSD_SOURCE /* For timeradd, timersub, timercmp. */
@@ -69,7 +69,7 @@
 #include "linux_termios.h"
 
 /* TCGETX/TCSETX is not available everywhere. */
-#if defined(TCGETX) && defined(TCSETX) && defined(HAVE_TERMIOX)
+#if defined(TCGETX) && defined(TCSETX) && defined(HAVE_STRUCT_TERMIOX)
 #define USE_TERMIOX
 #endif
 #endif
@@ -83,7 +83,7 @@
 #endif
 
 /* Non-standard baudrates are not available everywhere. */
-#if (defined(HAVE_TERMIOS_SPEED) || defined(HAVE_TERMIOS2_SPEED)) && defined(HAVE_BOTHER)
+#if (defined(HAVE_TERMIOS_SPEED) || defined(HAVE_TERMIOS2_SPEED)) && defined(HAVE_DECL_BOTHER)
 #define USE_TERMIOS_SPEED
 #endif
 
@@ -224,7 +224,7 @@ extern void (*sp_debug_handler)(const char *format, ...);
 #define TRACE(fmt, ...) DEBUG_FMT("%s(" fmt ") called", __func__, __VA_ARGS__)
 #define TRACE_VOID() DEBUG_FMT("%s() called", __func__)
 
-#define TRY(x) do { int ret = x; if (ret != SP_OK) RETURN_CODEVAL(ret); } while (0)
+#define TRY(x) do { int retval = x; if (retval != SP_OK) RETURN_CODEVAL(retval); } while (0)
 
 SP_PRIV struct sp_port **list_append(struct sp_port **list, const char *portname);