diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-06-26 16:38:42 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-06-26 16:41:26 +0200 |
| commit | d3c279d4f632c9b9e9fcb46df78f7ace9acffc56 (patch) | |
| tree | 9d891bb3dfc7dd48602f37d4d8d85de57745d630 /utils/open-plc-utils | |
| parent | 940c522cf694b87a58a20152401d9dbe7f0a935c (diff) | |
open-plc-utils: fix musl and fortify source compatibility
- Include `poll.h` at the top of `ether/readpacket.c` to avoid nested
declaration errors caused by fortify source headers
- Add missing `sys/select.h` include to `serial/serial.c`
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Diffstat (limited to 'utils/open-plc-utils')
| -rw-r--r-- | utils/open-plc-utils/Makefile | 4 | ||||
| -rw-r--r-- | utils/open-plc-utils/patches/100-musl-compat.patch | 33 |
2 files changed, 35 insertions, 2 deletions
diff --git a/utils/open-plc-utils/Makefile b/utils/open-plc-utils/Makefile index 1c8ef9d51..480711a74 100644 --- a/utils/open-plc-utils/Makefile +++ b/utils/open-plc-utils/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2013-2014 OpenWrt.org +# Copyright (C) 2013-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=open-plc-utils -PKG_VERSION:=2015-02-23 +PKG_VERSION:=2015-06-26 PKG_RELEASE:=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git diff --git a/utils/open-plc-utils/patches/100-musl-compat.patch b/utils/open-plc-utils/patches/100-musl-compat.patch new file mode 100644 index 000000000..c20c0a1fe --- /dev/null +++ b/utils/open-plc-utils/patches/100-musl-compat.patch @@ -0,0 +1,33 @@ +--- a/ether/readpacket.c ++++ b/ether/readpacket.c +@@ -70,6 +70,10 @@ + #include <memory.h> + #include <errno.h> + ++#if defined (__linux__) ++#include <poll.h> ++#endif ++ + #include "../ether/channel.h" + #include "../tools/memory.h" + #include "../tools/error.h" +@@ -95,8 +99,6 @@ ssize_t readpacket (struct channel const + + #elif defined (__linux__) + +-#include <sys/poll.h> +- + struct pollfd pollfd = + { + channel->fd, +--- a/serial/serial.c ++++ b/serial/serial.c +@@ -69,6 +69,8 @@ + + #if defined (WIN32) + #include <Windows.h> ++#else ++#include <sys/select.h> + #endif + + /*====================================================================* |