mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-07-16 15:13:10 +03:00
ee25f77757
because some programs to be run on the host use malloc.h in an incompatible way. package/iproute2/patches/004-darwin_fixes.patch has a fix for Darwin, however the fix can be made to work on other BSD platforms by changing the patch as below. I think a similar approach should work for other BSD-derived platforms, replacing the #ifndef __APPLE__ with #if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(...) or perhaps even with just #ifdef __linux__ if the set of platforms where malloc.h is ok is small or restricted to just linux In any case, the patch is below. (#3869) Signed-off-by: Luigi Rizzo <rizzo@iet.unipi.it> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12249 3c298f89-4303-0410-b956-a3cf2f4a3e73
68 lines
2.2 KiB
Diff
68 lines
2.2 KiB
Diff
Index: iproute-2.6.20-070313/netem/maketable.c
|
|
===================================================================
|
|
--- iproute-2.6.20-070313.orig/netem/maketable.c 2007-06-09 13:53:56.000000000 +0100
|
|
+++ iproute-2.6.20-070313/netem/maketable.c 2007-06-09 13:54:01.000000000 +0100
|
|
@@ -10,7 +10,9 @@
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <math.h>
|
|
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
|
#include <malloc.h>
|
|
+#endif
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
Index: iproute-2.6.20-070313/netem/normal.c
|
|
===================================================================
|
|
--- iproute-2.6.20-070313.orig/netem/normal.c 2007-06-09 13:53:56.000000000 +0100
|
|
+++ iproute-2.6.20-070313/netem/normal.c 2007-06-09 13:54:01.000000000 +0100
|
|
@@ -8,8 +8,12 @@
|
|
#include <string.h>
|
|
#include <limits.h>
|
|
|
|
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
|
#include <linux/types.h>
|
|
#include <linux/pkt_sched.h>
|
|
+#else
|
|
+#define NETEM_DIST_SCALE 8192
|
|
+#endif
|
|
|
|
#define TABLESIZE 16384
|
|
#define TABLEFACTOR NETEM_DIST_SCALE
|
|
Index: iproute-2.6.20-070313/netem/pareto.c
|
|
===================================================================
|
|
--- iproute-2.6.20-070313.orig/netem/pareto.c 2007-06-09 13:53:56.000000000 +0100
|
|
+++ iproute-2.6.20-070313/netem/pareto.c 2007-06-09 13:54:01.000000000 +0100
|
|
@@ -7,8 +7,12 @@
|
|
#include <math.h>
|
|
#include <limits.h>
|
|
|
|
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
|
#include <linux/types.h>
|
|
#include <linux/pkt_sched.h>
|
|
+#else
|
|
+#define NETEM_DIST_SCALE 8192
|
|
+#endif
|
|
|
|
static const double a=3.0;
|
|
#define TABLESIZE 16384
|
|
Index: iproute-2.6.20-070313/netem/paretonormal.c
|
|
===================================================================
|
|
--- iproute-2.6.20-070313.orig/netem/paretonormal.c 2007-06-09 13:53:56.000000000 +0100
|
|
+++ iproute-2.6.20-070313/netem/paretonormal.c 2007-06-09 13:54:01.000000000 +0100
|
|
@@ -15,10 +15,13 @@
|
|
#include <string.h>
|
|
#include <math.h>
|
|
#include <limits.h>
|
|
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
|
#include <malloc.h>
|
|
-
|
|
#include <linux/types.h>
|
|
#include <linux/pkt_sched.h>
|
|
+#else
|
|
+#define NETEM_DIST_SCALE 8192
|
|
+#endif
|
|
|
|
#define TABLESIZE 16384
|
|
#define TABLEFACTOR NETEM_DIST_SCALE
|