summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Mares <mj@ucw.cz>1999-01-23 22:08:59 +0100
committerMartin Mares <mj@ucw.cz>1999-01-23 22:08:59 +0100
commit294c182eb1dd02d0ae8658acb4a21db5d2977f3c (patch)
tree5575654871c6efe661665639eca443bc51a41e93
parent2c2f67bd83c267c1dbee68c6ed7d67f9be77e566 (diff)
downloadbird-294c182eb1dd02d0ae8658acb4a21db5d2977f3c.tar
bird-294c182eb1dd02d0ae8658acb4a21db5d2977f3c.zip
Replaced the old ugly ipv6 compilation hack by a conditional in Modules.
-rw-r--r--lib/Modules7
-rw-r--r--lib/ipv6.c4
-rw-r--r--lib/ipv6.h4
3 files changed, 7 insertions, 8 deletions
diff --git a/lib/Modules b/lib/Modules
index ba743da..b347aa2 100644
--- a/lib/Modules
+++ b/lib/Modules
@@ -2,10 +2,13 @@ birdlib.h
bitops.c
bitops.h
ip.h
-ipv4.c
-ipv4.h
+#ifdef CONFIG_IPV6
ipv6.c
ipv6.h
+#else
+ipv4.c
+ipv4.h
+#endif
lists.c
lists.h
md5.c
diff --git a/lib/ipv6.c b/lib/ipv6.c
index 2d01e83..e612af7 100644
--- a/lib/ipv6.c
+++ b/lib/ipv6.c
@@ -6,11 +6,7 @@
* Can be freely distributed and used under the terms of the GNU GPL.
*/
-#ifdef IPV6
-
#include "nest/bird.h"
#include "lib/ip.h"
#error "Ought to implement these."
-
-#endif
diff --git a/lib/ipv6.h b/lib/ipv6.h
index b8d2e9f..35d8e29 100644
--- a/lib/ipv6.h
+++ b/lib/ipv6.h
@@ -6,8 +6,8 @@
* Can be freely distributed and used under the terms of the GNU GPL.
*/
-#ifndef _BIRD_IPV4_H_
-#define _BIRD_IPV4_H_
+#ifndef _BIRD_IPV6_H_
+#define _BIRD_IPV6_H_
#include <netinet/in.h>
#include <string.h>