You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

59 lines
1.3 KiB

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