Author: tjansen Date: Mon Nov 2 17:33:07 2009 New Revision: 1491 Log: Removed superfluous ifdefs for log.h. log.h has the ifdef itself, do not wrap each include with a redundant ifdef. Modified: trunk/libpisa/conmgr.c trunk/pisasd/sdmain.c trunk/pisasd/sdtun.c Modified: trunk/libpisa/conmgr.c ============================================================================== --- trunk/libpisa/conmgr.c Mon Nov 2 17:30:00 2009 (r1490) +++ trunk/libpisa/conmgr.c Mon Nov 2 17:33:07 2009 (r1491) @@ -14,9 +14,7 @@ #include "conmgr.h" #include "tunnel.h" #include "nat.h" -#ifdef CONFIG_PISA_LOGGING -# include "log.h" -#endif +#include "log.h" /** * Constructor for pisa_conmgr_entry instances. Modified: trunk/pisasd/sdmain.c ============================================================================== --- trunk/pisasd/sdmain.c Mon Nov 2 17:30:00 2009 (r1490) +++ trunk/pisasd/sdmain.c Mon Nov 2 17:33:07 2009 (r1491) @@ -37,10 +37,7 @@ #include "libpisa/ctrlhandler.h" #include "libpisa/pisaconf.h" #include "libpisa/scheduler.h" - -#ifdef CONFIG_PISA_LOGGING -# include "libpisa/log.h" -#endif +#include "libpisa/log.h" #ifdef CONFIG_PISA_PERFORMANCE # include "performance/pisaperf.h" Modified: trunk/pisasd/sdtun.c ============================================================================== --- trunk/pisasd/sdtun.c Mon Nov 2 17:30:00 2009 (r1490) +++ trunk/pisasd/sdtun.c Mon Nov 2 17:33:07 2009 (r1491) @@ -20,10 +20,7 @@ #include "libpisa/nat.h" #include "sdclients.h" #include "libpisa/arp.h" - -#ifdef CONFIG_PISA_LOGGING -# include "libpisa/log.h" -#endif +#include "libpisa/log.h" /** * Handle a tunnel control packet of type data. This was obsoleted by