fcgi: moved to github
[openwrt.org/packages.git] / ipv6 / wide-dhcpv6 / patches / 002-fix-dprintf-clash.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
Index: wide-dhcpv6-20080615/common.c
===================================================================
--- wide-dhcpv6-20080615.orig/common.c  2010-11-02 22:07:03.161000001 +0100
+++ wide-dhcpv6-20080615/common.c       2010-11-02 22:07:19.532000002 +0100
@@ -3207,7 +3207,7 @@
 }
 
 void
-dprintf(int level, const char *fname, const char *fmt, ...)
+my_dprintf(int level, const char *fname, const char *fmt, ...)
 {
        va_list ap;
        char logbuf[LINE_MAX];
Index: wide-dhcpv6-20080615/Makefile.in
===================================================================
--- wide-dhcpv6-20080615.orig/Makefile.in       2010-11-02 22:07:03.151000001 +0100
+++ wide-dhcpv6-20080615/Makefile.in    2010-11-02 22:07:19.533000002 +0100
@@ -37,7 +37,7 @@
 group= @group@
 
 CFLAGS=        @CFLAGS@ @DEFS@ -DSYSCONFDIR=\"${sysconfdir}\" \
-       -DLOCALDBDIR=\"${localdbdir}\"
+       -DLOCALDBDIR=\"${localdbdir}\" $(EXTRA_CFLAGS)
 LDFLAGS=@LDFLAGS@
 LIBOBJS=@LIBOBJS@
 LIBS=  @LIBS@ @LEXLIB@
Index: wide-dhcpv6-20080615/common.h
===================================================================
--- wide-dhcpv6-20080615.orig/common.h  2010-11-02 22:07:23.187000002 +0100
+++ wide-dhcpv6-20080615/common.h       2010-11-02 22:08:43.646001043 +0100
@@ -155,7 +155,6 @@
 extern int in6_addrscopebyif __P((struct in6_addr *, char *));
 extern int in6_scope __P((struct in6_addr *));
 extern void setloglevel __P((int));
-extern void dprintf __P((int, const char *, const char *, ...));
 extern int get_duid __P((char *, struct duid *));
 extern void dhcp6_init_options __P((struct dhcp6_optinfo *));
 extern void dhcp6_clear_options __P((struct dhcp6_optinfo *));
Index: wide-dhcpv6-20080615/debug.h
===================================================================
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
+++ wide-dhcpv6-20080615/debug.h        2010-11-02 22:14:58.354999418 +0100
@@ -0,0 +1,13 @@
+#ifndef MY_DEBUG_H_
+#define MY_DEBUG_H_
+
+/* First include stdio.h, which may contain the prototype for the external dprintf.
+ * We do not want that. We redefine dprintf to our local implementation. */
+#include <stdio.h>
+#define dprintf my_dprintf
+#ifndef __P
+# define __P(x) x
+#endif
+extern void my_dprintf __P((int, const char *, const char *, ...));
+
+#endif /* MY_DEBUG_H_ */
 
comments