[hipl-commit] [trunk] Rev 3995: Conditionally compile hipd/oppdb.c instead of disabling it via the preprocessor.

  • From: Diego Biurrun <diego@xxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Wed, 17 Mar 2010 20:46:40 +0200

Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 17/03/2010 at 20:46:40
Revision: 3995
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  Conditionally compile hipd/oppdb.c instead of disabling it via the 
preprocessor.

Modified:
  M  Makefile.am
  M  hipd/oppdb.c

=== modified file 'Makefile.am'
--- Makefile.am 2010-03-10 17:44:36 +0000
+++ Makefile.am 2010-03-17 18:46:11 +0000
@@ -137,7 +137,6 @@
                     hipd/registration.c \
                     hipd/user.c \
                     hipd/hadb.c \
-                    hipd/oppdb.c \
                     hipd/close.c \
                     hipd/configfilereader.c \
                     hipd/input.c \
@@ -181,6 +180,10 @@
 hipd_hipd_SOURCES +=  hipd/pisa.c
 endif
 
+if HIP_OPPORTUNISTIC
+hipd_hipd_SOURCES += hipd/oppdb.c
+endif
+
 firewall_hipfw_SOURCES = firewall/firewall.c \
                          firewall/conntrack.c \
                          firewall/rule_management.c \

=== modified file 'hipd/oppdb.c'
--- hipd/oppdb.c        2010-03-17 18:24:26 +0000
+++ hipd/oppdb.c        2010-03-17 18:46:11 +0000
@@ -11,8 +11,6 @@
 #define _BSD_SOURCE
 
 #include "config.h"
-#ifdef CONFIG_HIP_OPPORTUNISTIC
-
 #include "oppdb.h"
 #include "hadb.h"
 #include "accessor.h"
@@ -858,5 +856,3 @@
     HIP_UNLOCK_HT(&opp_db);
     return ret;
 }
-
-#endif /* CONFIG_HIP_OPPORTUNISTIC */

Other related posts:

  • » [hipl-commit] [trunk] Rev 3995: Conditionally compile hipd/oppdb.c instead of disabling it via the preprocessor. - Diego Biurrun