From 360bc5bfd8c4b67487bef77fa9343779bd2ca6e6 Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Sun, 26 Oct 2014 15:56:33 +0400
Subject: Check for cfmakeraw

---
 src/include/pcp/config.h.in        | 1 +
 src/libpcp/src/secureconnect.c     | 4 +---
 src/pmdas/roomtemp/mlan/linuxlnk.c | 3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/include/pcp/config.h.in b/src/include/pcp/config.h.in
index ae1ccdd..4081499 100644
--- a/src/include/pcp/config.h.in
+++ b/src/include/pcp/config.h.in
@@ -281,6 +281,7 @@ extern "C" {
 #undef HAVE_FLOG10
 #undef HAVE_POW
 #undef HAVE_DIRNAME
+#undef HAVE_CFMAKERAW
 #undef HAVE_BASENAME
 #undef HAVE_SYSINFO
 #undef HAVE_TRACE_BACK_STACK
diff --git a/src/libpcp/src/secureconnect.c b/src/libpcp/src/secureconnect.c
index 3391329..4778a47 100644
--- a/src/libpcp/src/secureconnect.c
+++ b/src/libpcp/src/secureconnect.c
@@ -23,10 +23,8 @@
 #include <secerr.h>
 #include <sslerr.h>
 #include <pk11pub.h>
+#include <termios.h>
 #include <sys/stat.h>
-#ifdef HAVE_SYS_TERMIOS_H
-#include <sys/termios.h>
-#endif
 
 /*
  * We shift NSS/NSPR/SSL/SASL errors below the valid range for other
diff --git a/src/pmdas/roomtemp/mlan/linuxlnk.c b/src/pmdas/roomtemp/mlan/linuxlnk.c
index aa20695..4c90796 100644
--- a/src/pmdas/roomtemp/mlan/linuxlnk.c
+++ b/src/pmdas/roomtemp/mlan/linuxlnk.c
@@ -96,6 +96,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
+#include "config.h"
 
 #include <stdio.h>
 #include <unistd.h>
@@ -126,7 +127,7 @@ void CloseCOM(void);
 // LinuxLNK global
 int fd;
 
-#ifdef IS_SOLARIS
+#ifndef HAVE_CFMAKERAW
 int cfmakeraw(struct termios *termios_p)
 {
   termios_p->c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP
-- 
cgit v1.2.3