summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2014-10-26 15:56:33 +0400
committerIgor Pashev <pashev.igor@gmail.com>2014-10-26 16:17:24 +0400
commit360bc5bfd8c4b67487bef77fa9343779bd2ca6e6 (patch)
tree7057f0b72d31b32ae1fb0638c03aa1eb30992e08 /src
parent0e04bca260780b2ce04e123d09302ce98d9b597a (diff)
downloadpcp-360bc5bfd8c4b67487bef77fa9343779bd2ca6e6.tar.gz
Check for cfmakeraw
Diffstat (limited to 'src')
-rw-r--r--src/include/pcp/config.h.in1
-rw-r--r--src/libpcp/src/secureconnect.c4
-rw-r--r--src/pmdas/roomtemp/mlan/linuxlnk.c3
3 files changed, 4 insertions, 4 deletions
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