Merge pull request #3028 from thess/tcpreplay-fixes

tcpreplay: Fix builds - musl compatibility
This commit is contained in:
Ted Hess 2016-08-15 09:33:10 -04:00 committed by GitHub
commit 6994b98f5a
2 changed files with 32 additions and 1 deletions

View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=tcpreplay
PKG_VERSION:=4.1.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/appneta/tcpreplay/releases/download/v$(PKG_VERSION)

View File

@ -0,0 +1,31 @@
--- a/src/common/fakepoll.h
+++ b/src/common/fakepoll.h
@@ -40,11 +40,11 @@
#define POLL_NO_WARN
#define SYS_POLL_NO_WARN
-#ifdef HAVE_SYS_POLL_H
-#include <sys/poll.h>
-#define __FAKEPOLL_H
-#elif HAVE_POLL_H
+#ifdef HAVE_POLL_H
#include <poll.h>
+#define __FAKEPOLL_H
+#elif HAVE_SYS_POLL_H
+#include <sys/poll.h>
#define __FAKEPOLL_H
#endif
--- a/src/common/sendpacket.c
+++ b/src/common/sendpacket.c
@@ -148,10 +148,6 @@
#include "txring.h"
#endif
-#ifndef __GLIBC__
-typedef int socklen_t;
-#endif
-
static sendpacket_t *sendpacket_open_pf(const char *, char *);
static struct tcpr_ether_addr *sendpacket_get_hwaddr_pf(sendpacket_t *);
static int get_iface_index(int fd, const char *device, char *);