mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity
7dc435ea29
openwrt/package/iproute2/patches/004-darwin_fixes.patch

68 lines
2.2 KiB
Diff
Raw Normal View History

update iproute2 to 2.6.20-070313, and package genl utility SVN-Revision: 7540
2007-06-09 21:17:46 +08:00
Index: iproute-2.6.20-070313/netem/maketable.c
refresh all package patches in the buildroot using quilt SVN-Revision: 7490
2007-06-04 19:25:53 +08:00
===================================================================
update iproute2 to 2.6.20-070313, and package genl utility SVN-Revision: 7540
2007-06-09 21:17:46 +08:00
--- 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
Fix MacOSX build errors with iproute2 (#1533) SVN-Revision: 6904
2007-04-09 04:59:28 +08:00
@@ -10,7 +10,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
package iproute2 has problems building on recent BSD-derived platforms 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> SVN-Revision: 12249
2008-08-09 05:49:17 +08:00
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
Fix MacOSX build errors with iproute2 (#1533) SVN-Revision: 6904
2007-04-09 04:59:28 +08:00
#include <malloc.h>
+#endif
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
update iproute2 to 2.6.20-070313, and package genl utility SVN-Revision: 7540
2007-06-09 21:17:46 +08:00
Index: iproute-2.6.20-070313/netem/normal.c
refresh all package patches in the buildroot using quilt SVN-Revision: 7490
2007-06-04 19:25:53 +08:00
===================================================================
update iproute2 to 2.6.20-070313, and package genl utility SVN-Revision: 7540
2007-06-09 21:17:46 +08:00
--- 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
Fix MacOSX build errors with iproute2 (#1533) SVN-Revision: 6904
2007-04-09 04:59:28 +08:00
@@ -8,8 +8,12 @@
#include <string.h>
#include <limits.h>
package iproute2 has problems building on recent BSD-derived platforms 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> SVN-Revision: 12249
2008-08-09 05:49:17 +08:00
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
Fix MacOSX build errors with iproute2 (#1533) SVN-Revision: 6904
2007-04-09 04:59:28 +08:00
#include <linux/types.h>
#include <linux/pkt_sched.h>
+#else
+#define NETEM_DIST_SCALE 8192
+#endif
#define TABLESIZE 16384
#define TABLEFACTOR NETEM_DIST_SCALE
update iproute2 to 2.6.20-070313, and package genl utility SVN-Revision: 7540
2007-06-09 21:17:46 +08:00
Index: iproute-2.6.20-070313/netem/pareto.c
refresh all package patches in the buildroot using quilt SVN-Revision: 7490
2007-06-04 19:25:53 +08:00
===================================================================
update iproute2 to 2.6.20-070313, and package genl utility SVN-Revision: 7540
2007-06-09 21:17:46 +08:00
--- 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
Fix MacOSX build errors with iproute2 (#1533) SVN-Revision: 6904
2007-04-09 04:59:28 +08:00
@@ -7,8 +7,12 @@
#include <math.h>
#include <limits.h>
package iproute2 has problems building on recent BSD-derived platforms 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> SVN-Revision: 12249
2008-08-09 05:49:17 +08:00
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
Fix MacOSX build errors with iproute2 (#1533) SVN-Revision: 6904
2007-04-09 04:59:28 +08:00
#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
update iproute2 to 2.6.20-070313, and package genl utility SVN-Revision: 7540
2007-06-09 21:17:46 +08:00
Index: iproute-2.6.20-070313/netem/paretonormal.c
refresh all package patches in the buildroot using quilt SVN-Revision: 7490
2007-06-04 19:25:53 +08:00
===================================================================
update iproute2 to 2.6.20-070313, and package genl utility SVN-Revision: 7540
2007-06-09 21:17:46 +08:00
--- 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
Fix MacOSX build errors with iproute2 (#1533) SVN-Revision: 6904
2007-04-09 04:59:28 +08:00
@@ -15,10 +15,13 @@
#include <string.h>
#include <math.h>
#include <limits.h>
package iproute2 has problems building on recent BSD-derived platforms 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> SVN-Revision: 12249
2008-08-09 05:49:17 +08:00
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
Fix MacOSX build errors with iproute2 (#1533) SVN-Revision: 6904
2007-04-09 04:59:28 +08:00
#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
Reference in New Issue Copy Permalink