package/ser2net/0001-Fix-TIOCSRS485-undeclared-error.patch

   1 ser2net: Fix compilation failures due to missing TIOCSRS485 macro
   2
   3 Patch sent upstream:
   4         https://sourceforge.net/p/ser2net/mailman/message/32905302/
   5
   6 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
   7
   8 From: Yegor Yefremov <yegorslists@googlemail.com>
   9
  10 include <asm-generic/ioctls.h> fixes compilations for systems,
  11 where <asm-generic/ioctls.h> won't be included automatically.
  12
  13 Move special Linux includes to dataxfer.h.
  14
  15 Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
  16 ---
  17  dataxfer.h | 5 +++--
  18  devcfg.c   | 2 --
  19  2 files changed, 3 insertions(+), 4 deletions(-)
  20
  21 diff --git a/dataxfer.h b/dataxfer.h
  22 index bd2665e..c3d7431 100644
  23 --- a/dataxfer.h
  24 +++ b/dataxfer.h
  25 @@ -20,8 +20,6 @@
  26  #ifndef DATAXFER
  27  #define DATAXFER
  28
  29 -#include <linux/serial.h>
  30 -
  31  #include "controller.h"
  32
  33  #ifdef USE_UUCP_LOCKING
  34 @@ -30,6 +28,9 @@ extern int uucp_locking_enabled;
  35
  36  #ifdef linux
  37
  38 +#include <linux/serial.h>
  39 +#include <asm-generic/ioctls.h>
  40 +
  41  #define USE_RS485_FEATURE
  42
  43  /* Check, if the toolchain provides serial_rs485 structure and macros */
  44 diff --git a/devcfg.c b/devcfg.c
  45 index ab819a6..1f84714 100644
  46 --- a/devcfg.c
  47 +++ b/devcfg.c
  48 @@ -18,7 +18,6 @@
  49   */
  50
  51  /* This code handles generating the configuration for the serial port. */
  52 -
  53  #include <unistd.h>
  54  #include <termios.h>
  55  #include <sys/ioctl.h>
  56 @@ -31,7 +30,6 @@
  57  #include <signal.h>
  58  #include <errno.h>
  59  #include <syslog.h>
  60 -#include <linux/serial.h>
  61
  62  #include "ser2net.h"
  63  #include "selector.h"
  64 --
  65 1.9.1