[hipl-commit] [trunk] Rev 4356: Conditionally compile hipd/oppipdb.c instead of enclosing it by #ifdef.
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: hipl-commit@xxxxxxxxxxxxx
- Date: Tue, 20 Apr 2010 14:13:07 +0300
Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 20/04/2010 at 14:13:07
Revision: 4356
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk
Log:
Conditionally compile hipd/oppipdb.c instead of enclosing it by #ifdef.
Modified:
M Makefile.am
M hipd/oppipdb.c
=== modified file 'Makefile.am'
--- Makefile.am 2010-04-20 10:57:12 +0000
+++ Makefile.am 2010-04-20 11:12:06 +0000
@@ -139,7 +139,6 @@
hipd/nat.c \
hipd/netdev.c \
hipd/nsupdate.c \
- hipd/oppipdb.c \
hipd/output.c \
hipd/registration.c \
hipd/update.c \
@@ -165,7 +164,8 @@
endif
if HIP_OPPORTUNISTIC
-hipd_hipd_SOURCES += hipd/oppdb.c
+hipd_hipd_SOURCES += hipd/oppdb.c \
+ hipd/oppipdb.c
endif
firewall_hipfw_SOURCES = firewall/cache.c \
=== modified file 'hipd/oppipdb.c'
--- hipd/oppipdb.c 2010-04-16 18:46:48 +0000
+++ hipd/oppipdb.c 2010-04-20 11:12:06 +0000
@@ -12,9 +12,6 @@
* @author Alberto Garcia
*/
-#include "config.h"
-#ifdef CONFIG_HIP_OPPORTUNISTIC
-
#include "oppipdb.h"
#define HIP_LOCK_OPPIP(entry)
@@ -225,5 +222,3 @@
hip_oppipdb_del_entry_by_entry(ret, NULL);
}
}
-
-#endif /* CONFIG_HIP_OPPORTUNISTIC */
Other related posts:
- » [hipl-commit] [trunk] Rev 4356: Conditionally compile hipd/oppipdb.c instead of enclosing it by #ifdef. - Diego Biurrun
