X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=linux_termios.c;h=92793df06d61b7de6d63bd3624a097e4b57ae280;hb=deef6e528cabe1858c2c3c5fa45f789f3d701366;hp=7c1540a2ddb4e0450a4d1e4c5b66b985a263fb6c;hpb=970f279ae4767819a816573ae354813d37d5091d;p=libserialport.git

diff --git a/linux_termios.c b/linux_termios.c
index 7c1540a..92793df 100644
--- a/linux_termios.c
+++ b/linux_termios.c
@@ -33,10 +33,11 @@
  * TCSETX/TCGETX ioctls used with struct termiox, others do not.
  */
 
+#include <stdlib.h>
 #include <linux/termios.h>
 #include "linux_termios.h"
 
-SP_PRIV int get_termios_get_ioctl(void)
+SP_PRIV unsigned long get_termios_get_ioctl(void)
 {
 #ifdef HAVE_TERMIOS2
 	return TCGETS2;
@@ -45,7 +46,7 @@ SP_PRIV int get_termios_get_ioctl(void)
 #endif
 }
 
-SP_PRIV int get_termios_set_ioctl(void)
+SP_PRIV unsigned long get_termios_set_ioctl(void)
 {
 #ifdef HAVE_TERMIOS2
 	return TCSETS2;
@@ -54,7 +55,7 @@ SP_PRIV int get_termios_set_ioctl(void)
 #endif
 }
 
-SP_PRIV int get_termios_size(void)
+SP_PRIV size_t get_termios_size(void)
 {
 #ifdef HAVE_TERMIOS2
 	return sizeof(struct termios2);
@@ -63,7 +64,7 @@ SP_PRIV int get_termios_size(void)
 #endif
 }
 
-#if defined(HAVE_TERMIOS_SPEED) || defined(HAVE_TERMIOS2_SPEED)
+#if (defined(HAVE_TERMIOS_SPEED) || defined(HAVE_TERMIOS2_SPEED)) && defined(HAVE_BOTHER)
 SP_PRIV int get_termios_speed(void *data)
 {
 #ifdef HAVE_TERMIOS2
@@ -91,7 +92,7 @@ SP_PRIV void set_termios_speed(void *data, int speed)
 #endif
 
 #ifdef HAVE_TERMIOX
-SP_PRIV int get_termiox_size(void)
+SP_PRIV size_t get_termiox_size(void)
 {
 	return sizeof(struct termiox);
 }