diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-11-23 20:02:19 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2012-11-23 20:02:19 +0000 |
| commit | ba6c8bd6142f5147e74efdc606ed537bf5a12145 (patch) | |
| tree | ab9415cc44358781aede56a1a628bf620993d2e2 | |
| parent | 92fd6e6f1a93614ef5c5f0d960f67fb110bf8d2e (diff) | |
| download | upstream-ba6c8bd6142f5147e74efdc606ed537bf5a12145.tar.gz upstream-ba6c8bd6142f5147e74efdc606ed537bf5a12145.tar.bz2 upstream-ba6c8bd6142f5147e74efdc606ed537bf5a12145.zip | |
linux-atm: add portability fixes
Spotted while building against musl libc.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 34312
| -rw-r--r-- | package/linux-atm/patches/400-portability_fixes.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/package/linux-atm/patches/400-portability_fixes.patch b/package/linux-atm/patches/400-portability_fixes.patch new file mode 100644 index 0000000000..462f57c3f4 --- /dev/null +++ b/package/linux-atm/patches/400-portability_fixes.patch @@ -0,0 +1,60 @@ +diff -urN linux-atm-2.5.2/src/ilmid/io.c linux-atm-2.5.2.new/src/ilmid/io.c +--- linux-atm-2.5.2/src/ilmid/io.c 2008-01-01 01:14:50.000000000 +0100 ++++ linux-atm-2.5.2.new/src/ilmid/io.c 2012-11-23 17:32:18.149268039 +0100 +@@ -48,6 +48,14 @@ + be manually configured (after ilmid has + registered the "official" address) - HACK */ + ++#ifndef SUN_LEN ++# include <string.h> /* For prototype of `strlen'. */ ++ ++/* Evaluate to actual length of the `sockaddr_un' structure. */ ++# define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) \ ++ + strlen ((ptr)->sun_path)) ++#endif ++ + extern SysGroup *remsys; + extern State ilmi_state; + static short atm_itf = -1; /* bad value */ +diff -urN linux-atm-2.5.2/src/mpoad/io.c linux-atm-2.5.2.new/src/mpoad/io.c +--- linux-atm-2.5.2/src/mpoad/io.c 2008-01-01 01:14:51.000000000 +0100 ++++ linux-atm-2.5.2.new/src/mpoad/io.c 2012-11-23 17:34:17.745271101 +0100 +@@ -10,14 +10,7 @@ + #include <errno.h> + #include <sys/ioctl.h> + #include <sys/param.h> /* for OPEN_MAX */ +-#if __GLIBC__ >= 2 + #include <sys/poll.h> +-#else /* ugly hack to make it compile on RH 4.2 - WA */ +-#include <syscall.h> +-#include <linux/poll.h> +-#define SYS_poll 168 +-_syscall3(int,poll,struct pollfd *,ufds,unsigned int,nfds,int,timeout); +-#endif + #include <atm.h> + #include <linux/types.h> + #include <linux/atmioc.h> +diff -urN linux-atm-2.5.2/src/sigd/atmsigd.c linux-atm-2.5.2.new/src/sigd/atmsigd.c +--- linux-atm-2.5.2/src/sigd/atmsigd.c 2008-01-01 01:14:52.000000000 +0100 ++++ linux-atm-2.5.2.new/src/sigd/atmsigd.c 2012-11-23 17:30:38.689265492 +0100 +@@ -517,7 +517,7 @@ + exit(0); + } + } +- (void) on_exit(trace_on_exit,NULL); ++ (void) atexit(trace_on_exit); + poll_loop(); + close_all(); + for (sig = entities; sig; sig = sig->next) stop_saal(&sig->saal); +diff -urN linux-atm-2.5.2/src/test/align.c linux-atm-2.5.2.new/src/test/align.c +--- linux-atm-2.5.2/src/test/align.c 2001-10-10 00:33:08.000000000 +0200 ++++ linux-atm-2.5.2.new/src/test/align.c 2012-11-23 17:25:15.077257206 +0100 +@@ -24,7 +24,7 @@ + #include <signal.h> + #include <sys/types.h> + #include <sys/socket.h> +-#include <sys/errno.h> ++#include <errno.h> + #include <atm.h> + + |