From 9fa9eb9ac7bf1d3de825ee25a8f0ae81b7b77896 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Tue, 26 Jul 2016 16:51:15 +0000 Subject: Cleanup patches, a* categories. Rename them to follow the make makepatch naming, and regenerate them. With hat: portmgr Sponsored by: Absolight --- audio/xoscope/files/patch-ser__unix.c | 74 +++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 audio/xoscope/files/patch-ser__unix.c (limited to 'audio/xoscope/files/patch-ser__unix.c') diff --git a/audio/xoscope/files/patch-ser__unix.c b/audio/xoscope/files/patch-ser__unix.c new file mode 100644 index 000000000000..bee2d691f1db --- /dev/null +++ b/audio/xoscope/files/patch-ser__unix.c @@ -0,0 +1,74 @@ +--- ser_unix.c.orig 2008-12-17 17:46:15 UTC ++++ ser_unix.c +@@ -14,7 +14,14 @@ + #include + #include + #include ++#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#include ++#endif ++#ifdef BSD ++#include ++#else + #include ++#endif + #include + #include + #include +@@ -24,7 +31,11 @@ + + char device[512] = ""; /* Serial device */ + int sflags; ++#ifdef BSD ++struct termios stbuf, svbuf; /* termios: svbuf=saved, stbuf=set */ ++#else + struct termio stbuf, svbuf; /* termios: svbuf=saved, stbuf=set */ ++#endif + + char serial_error[256]; + +@@ -68,7 +79,11 @@ void + cleanup_serial(int fd) + { + if (fd > 0) { ++#ifdef BSD ++ if (tcsetattr(fd, TCSANOW, &svbuf) < 0 ) { ++#else + if (ioctl(fd, TCSETA, &svbuf) < 0) { ++#endif + /* sprintf(serial_error, "Can't ioctl set device %s", device); */ + /* perror(error); */ + } +@@ -86,12 +101,20 @@ findscope(char *dev, int i) + sprintf(serial_error, "%s %s", dev, strerror(errno)); + return(0); + } ++#ifdef BSD ++ if (tcgetattr(fd, &svbuf) < 0) { /* save settings */ ++#else + if (ioctl(fd, TCGETA, &svbuf) < 0) { /* save settings */ ++#endif + sprintf(serial_error, "%s Can't ioctl TCGETA", dev); + close(fd); + return(0); + } ++#ifdef BSD ++ if (tcsetattr(fd, TCSANOW, &stbuf) < 0) { ++#else + if (ioctl(fd, TCSETA, &stbuf) < 0) { ++#endif + sprintf(serial_error, "%s Can't ioctl TCSETA", dev); + close(fd); + return(0); +@@ -101,7 +124,11 @@ findscope(char *dev, int i) + return (1); /* serial port scope found! */ + } + ++#ifdef BSD ++ if (tcsetattr(fd, TCSANOW, &svbuf) < 0) { /* restore settings */ ++#else + if (ioctl(fd, TCSETA, &svbuf) < 0) { /* restore settings */ ++#endif + #if 0 + sprintf(serial_error, "Can't ioctl (set) %s", dev); + close(fd); -- cgit v1.2.3