cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1483 from jow-/open-plc-utils-musl-compat

Browse Source 
open-plc-utils: fix musl and fortify source compatibility
This commit is contained in:
Jo-Philipp Wich
2015-06-27 11:19:07 +02:00
parent 3ed70bb772 d3c279d4f6
commit 1696390af8
2 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/open-plc-utils/Makefile
+2 -2
View File
@@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=open-plc-utils PKG_NAME:=open-plc-utils
PKG_VERSION:=2015-02-23 PKG_VERSION:=2015-06-26
PKG_RELEASE:=$(PKG_SOURCE_VERSION) PKG_RELEASE:=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
utils/open-plc-utils/patches/100-musl-compat.patch
+33
View File
@@ -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
/*====================================================================*