[hipl-commit] [trunk] Rev 4010: Cleaned up pfkey compilation by removing duplicate conditionals.

  • From: Miika Komu <miika@xxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Thu, 18 Mar 2010 18:25:19 +0200

Committer: Miika Komu <miika@xxxxxx>
Date: 18/03/2010 at 18:25:19
Revision: 4010
Revision-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  Cleaned up pfkey compilation by removing duplicate conditionals.

Modified:
  M  lib/tool/pfkeysadb.c
  M  lib/tool/xfrmapi.c

=== modified file 'lib/tool/pfkeysadb.c'
--- lib/tool/pfkeysadb.c        2010-03-18 13:02:44 +0000
+++ lib/tool/pfkeysadb.c        2010-03-18 16:25:40 +0000
@@ -21,7 +21,6 @@
 #include "lib/core/debug.h"
 #include "pfkeysadb.h"
 
-#ifdef CONFIG_HIP_PFKEY
 /**
  * This function fills in policy0 and policylen0 according to the given 
parameters
  * The full implementation can be found in racoon.
@@ -98,5 +97,3 @@
     *policylen0                     = policylen;
     return 0;
 }
-
-#endif /* CONFIG_HIP_PFKEY */

=== modified file 'lib/tool/xfrmapi.c'
--- lib/tool/xfrmapi.c  2010-03-10 11:34:35 +0000
+++ lib/tool/xfrmapi.c  2010-03-18 16:25:40 +0000
@@ -23,8 +23,6 @@
 
 #include "xfrmapi.h"
 
-#ifndef CONFIG_HIP_PFKEY
-
 #define RTA_BUF_SIZE     2048
 
 /* New OSes have this, but older ones don't */
@@ -786,5 +784,3 @@
 out_err:
     return err;
 }
-
-#endif /* ! CONFIG_HIP_PFKEY */

Other related posts:

  • » [hipl-commit] [trunk] Rev 4010: Cleaned up pfkey compilation by removing duplicate conditionals. - Miika Komu