X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=linux_termios.c;h=3630e5758ae355ff823237a5ca39acda2cee8257;hb=fd20b0fc5a34cd7f776e4af6c763f59041de223b;hp=d45f8015914c1217d0dba9c974608b169e8aeb63;hpb=5cea279a85e16d20247d911b060b6aff8186003a;p=libserialport.git

diff --git a/linux_termios.c b/linux_termios.c
index d45f801..3630e57 100644
--- a/linux_termios.c
+++ b/linux_termios.c
@@ -33,40 +33,42 @@
  * TCSETX/TCGETX ioctls used with struct termiox, others do not.
  */
 
+#include <config.h>
+#include <stdlib.h>
 #include <linux/termios.h>
 #include "linux_termios.h"
 
-int get_termios_get_ioctl(void)
+SP_PRIV unsigned long get_termios_get_ioctl(void)
 {
-#ifdef HAVE_TERMIOS2
+#ifdef HAVE_STRUCT_TERMIOS2
 	return TCGETS2;
 #else
 	return TCGETS;
 #endif
 }
 
-int get_termios_set_ioctl(void)
+SP_PRIV unsigned long get_termios_set_ioctl(void)
 {
-#ifdef HAVE_TERMIOS2
+#ifdef HAVE_STRUCT_TERMIOS2
 	return TCSETS2;
 #else
 	return TCSETS;
 #endif
 }
 
-int get_termios_size(void)
+SP_PRIV size_t get_termios_size(void)
 {
-#ifdef HAVE_TERMIOS2
+#ifdef HAVE_STRUCT_TERMIOS2
 	return sizeof(struct termios2);
 #else
 	return sizeof(struct termios);
 #endif
 }
 
-#ifdef USE_TERMIOS_SPEED
-int get_termios_speed(void *data)
+#if (defined(HAVE_TERMIOS_SPEED) || defined(HAVE_TERMIOS2_SPEED)) && HAVE_DECL_BOTHER
+SP_PRIV int get_termios_speed(void *data)
 {
-#ifdef HAVE_TERMIOS2
+#ifdef HAVE_STRUCT_TERMIOS2
 	struct termios2 *term = (struct termios2 *) data;
 #else
 	struct termios *term = (struct termios *) data;
@@ -77,9 +79,9 @@ int get_termios_speed(void *data)
 		return term->c_ispeed;
 }
 
-void set_termios_speed(void *data, int speed)
+SP_PRIV void set_termios_speed(void *data, int speed)
 {
-#ifdef HAVE_TERMIOS2
+#ifdef HAVE_STRUCT_TERMIOS2
 	struct termios2 *term = (struct termios2 *) data;
 #else
 	struct termios *term = (struct termios *) data;
@@ -90,13 +92,13 @@ void set_termios_speed(void *data, int speed)
 }
 #endif
 
-#ifdef HAVE_TERMIOX
-int get_termiox_size(void)
+#ifdef HAVE_STRUCT_TERMIOX
+SP_PRIV size_t get_termiox_size(void)
 {
 	return sizeof(struct termiox);
 }
 
-int get_termiox_flow(void *data, int *rts, int *cts, int *dtr, int *dsr)
+SP_PRIV int get_termiox_flow(void *data, int *rts, int *cts, int *dtr, int *dsr)
 {
 	struct termiox *termx = (struct termiox *) data;
 	int flags = 0;
@@ -109,7 +111,7 @@ int get_termiox_flow(void *data, int *rts, int *cts, int *dtr, int *dsr)
 	return flags;
 }
 
-void set_termiox_flow(void *data, int rts, int cts, int dtr, int dsr)
+SP_PRIV void set_termiox_flow(void *data, int rts, int cts, int dtr, int dsr)
 {
 	struct termiox *termx = (struct termiox *) data;