wok diff setserial/stuff/setserial-2.17.u @ rev 16434

Merge branches
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Apr 18 13:51:05 2014 +0300 (2014-04-18)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/setserial/stuff/setserial-2.17.u	Fri Apr 18 13:51:05 2014 +0300
     1.3 @@ -0,0 +1,24 @@
     1.4 +--- setserial-2.17-ori/setserial.c.orig	2000-01-27 16:40:52.000000000 +0100
     1.5 ++++ setserial-2.17/setserial.c	2010-03-25 21:48:21.554872081 +0100
     1.6 +@@ -24,6 +24,8 @@
     1.7 + #endif
     1.8 + #include <linux/serial.h>
     1.9 + 
    1.10 ++#undef TIOCGHAYESESP
    1.11 ++
    1.12 + #include "version.h"
    1.13 + 
    1.14 + static char version_str[] = "setserial version " SETSERIAL_VERSION ", "
    1.15 +
    1.16 +Common subdirectories: setserial-2.17-ori/Documentation and setserial-2.17/Documentation
    1.17 +Common subdirectories: setserial-2.17-ori/linux and setserial-2.17/linux
    1.18 +--- setserial-2.17-ori/setserial.c	Thu Jan 27 16:40:52 2000
    1.19 ++++ setserial-2.17/setserial.c	Thu Jul 22 09:51:23 2010
    1.20 +@@ -15,6 +15,7 @@
    1.21 + #include <termios.h>
    1.22 + #include <string.h>
    1.23 + #include <errno.h>
    1.24 ++#include <stdlib.h>
    1.25 + 
    1.26 + #ifdef HAVE_ASM_IOCTLS_H
    1.27 + #include <asm/ioctls.h>