[patch] 0003-fix-include-paths-now-compile-with-both-glibc-and-mu.patch

0003-fix-include-paths-now-compile-with-both-glibc-and-mu.patch (text/plain), 2.43 KB, created by David Heidelberg (okias) on 2014-03-08 23:03:32 UTC

From b2d5267c7c5c53dffd90d2742efeb1365193f829 Mon Sep 17 00:00:00 2001
From: David Heidelberger <[e-mail]>
Date: Sat, 8 Mar 2014 23:30:05 +0100
Subject: [PATCH 3/7] fix include paths, now compile with both glibc and musl

---
 arping.c      | 14 +++++++-------
 ping_common.h |  4 ++--
 rarpd.c       | 14 +++++++-------
 rdisc.c       |  1 +
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/arping.c b/arping.c
index 35408c1..12c5fcc 100644
--- a/arping.c
+++ b/arping.c
@@ -11,17 +11,17 @@
  */
 
 #include <stdlib.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <linux/sockios.h>
-#include <sys/file.h>
-#include <sys/time.h>
-#include <sys/signal.h>
-#include <sys/ioctl.h>
+#include <signal.h>
 #include <net/if.h>
+#include <linux/sockios.h>
 #include <linux/if_packet.h>
 #include <linux/if_ether.h>
 #include <net/if_arp.h>
+#include <sys/file.h>
+#include <sys/time.h>
+#include <sys/ioctl.h>
+#include <sys/param.h>
+#include <sys/socket.h>
 #include <sys/uio.h>
 #ifdef CAPABILITIES
 #include <sys/prctl.h>
diff --git a/ping_common.h b/ping_common.h
index 27ae0f0..a1fa119 100644
--- a/ping_common.h
+++ b/ping_common.h
@@ -2,16 +2,16 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <time.h>
+#include <signal.h>
+#include <poll.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <linux/sockios.h>
 #include <sys/file.h>
 #include <sys/time.h>
-#include <sys/signal.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <sys/uio.h>
-#include <sys/poll.h>
 #include <ctype.h>
 #include <errno.h>
 #include <string.h>
diff --git a/rarpd.c b/rarpd.c
index b740e87..ff41371 100644
--- a/rarpd.c
+++ b/rarpd.c
@@ -17,18 +17,18 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <netdb.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <poll.h>
 #include <arpa/inet.h>
-#include <sys/ioctl.h>
-#include <sys/poll.h>
-#include <sys/errno.h>
-#include <sys/fcntl.h>
-#include <sys/socket.h>
-#include <sys/signal.h>
+#include <netinet/in.h>
 #include <linux/if.h>
 #include <linux/if_arp.h>
-#include <netinet/in.h>
 #include <linux/if_packet.h>
 #include <linux/filter.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
 
 int do_reload = 1;
 
diff --git a/rdisc.c b/rdisc.c
index c142773..42b47a4 100644
--- a/rdisc.c
+++ b/rdisc.c
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/socket.h>
+#include <sys/types.h>
 #include <sys/file.h>
 #include <malloc.h>
 
-- 
1.9.0