dsl-qos-queue: fix compile errors

git-svn-id: svn://svn.openwrt.org/openwrt/packages@16181 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2009-05-29 12:01:14 +00:00
parent 179e894702
commit f974fdab0b
3 changed files with 26 additions and 7 deletions

View File

@ -33,6 +33,7 @@ define Build/Compile
$(call Build/Compile/Default, \
CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libipq $(TARGET_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
LIBIPQ=$(STAGING_DIR)/usr/lib/libipq.a \
all \
)
endef

View File

@ -1,6 +1,5 @@
diff -urN dsl_qos_queue/dsl_qos_queue.c dsl_qos_queue.new/dsl_qos_queue.c
--- dsl_qos_queue/dsl_qos_queue.c 2006-03-28 20:48:18.000000000 +0200
+++ dsl_qos_queue.new/dsl_qos_queue.c 2006-08-18 22:14:12.000000000 +0200
--- a/dsl_qos_queue.c
+++ b/dsl_qos_queue.c
@@ -552,12 +552,12 @@
syslog(LOG_INFO, "setup()");
@ -16,9 +15,8 @@ diff -urN dsl_qos_queue/dsl_qos_queue.c dsl_qos_queue.new/dsl_qos_queue.c
for (i=0;i<MAX_QDEV;i++) if (_qdev[i]) hook_iptables(_qdev[i]);
diff -urN dsl_qos_queue/makefile dsl_qos_queue.new/makefile
--- dsl_qos_queue/makefile 2004-12-15 03:10:45.000000000 +0100
+++ dsl_qos_queue.new/makefile 2006-08-18 22:20:48.000000000 +0200
--- a/makefile
+++ b/makefile
@@ -4,14 +4,14 @@
all: dsl_qos_queue dsl_qos_train
clean:
@ -26,7 +24,7 @@ diff -urN dsl_qos_queue/makefile dsl_qos_queue.new/makefile
-dsl_qos_queue: dsl_qos_queue.o daemon.o $(LIBIPQ)
- $(CC) -o dsl_qos_queue dsl_qos_queue.o daemon.o -lipq
+dsl_qos_queue: dsl_qos_queue.o daemon.o
+ $(CC) $(CFLAGS) $(LDFLAGS) -o dsl_qos_queue dsl_qos_queue.o daemon.o -lipq
+ $(CC) $(CFLAGS) $(LDFLAGS) -o dsl_qos_queue dsl_qos_queue.o daemon.o $(LIBIPQ)
dsl_qos_queue.o: dsl_qos_queue.c
- $(CC) -c dsl_qos_queue.c
+ $(CC) $(CFLAGS) -c dsl_qos_queue.c

View File

@ -0,0 +1,20 @@
--- a/dsl_qos_queue.c
+++ b/dsl_qos_queue.c
@@ -12,8 +12,6 @@
// more accurate way to prevent packet queueing in the network
// device (in this case, ADSL modem).
//
-#include <linux/netfilter.h>
-#include <libipq.h>
#include <stdio.h>
#include <stdlib.h>
#include <netinet/in.h>
@@ -25,6 +23,8 @@
#include <unistd.h>
#include <syslog.h>
#include <string.h>
+#include <linux/netfilter.h>
+#include <libipq.h>
#include "daemon.h"