[pisa-src] r1493 - in trunk: performance/pisaperf.h pisacd/cdmain.c pisasd/sdmain.c
- From: Thomas Jansen <mithi@xxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Mon, 02 Nov 2009 17:52:18 +0100
Author: tjansen
Date: Mon Nov 2 17:52:18 2009
New Revision: 1493
Log:
Remove ifdefs around pisaperf.h includes.
pisaperf.h takes care of the ifdef itself now.
Modified:
trunk/performance/pisaperf.h
trunk/pisacd/cdmain.c
trunk/pisasd/sdmain.c
Modified: trunk/performance/pisaperf.h
==============================================================================
--- trunk/performance/pisaperf.h Mon Nov 2 17:46:00 2009 (r1492)
+++ trunk/performance/pisaperf.h Mon Nov 2 17:52:18 2009 (r1493)
@@ -14,6 +14,9 @@
#ifndef PISA_PISAPERF_H
#define PISA_PISAPERF_H
+#include "config.h"
+#ifdef CONFIG_PISA_PERFORMANCE
+
#include <stdio.h> /* FILE */
/*
@@ -85,4 +88,6 @@
pisa_perf_set *pisa_perf;
+#endif /* CONFIG_PISA_PERFORMANCE */
+
#endif /* PISA_PISAPERF_H */
Modified: trunk/pisacd/cdmain.c
==============================================================================
--- trunk/pisacd/cdmain.c Mon Nov 2 17:46:00 2009 (r1492)
+++ trunk/pisacd/cdmain.c Mon Nov 2 17:52:18 2009 (r1493)
@@ -29,13 +29,10 @@
#include "cdconfhandlers.h"
#include "libpisa/scheduler.h"
#include "cdtimeout.h"
+#include "performance/pisaperf.h"
extern pisa_conf_handle_func_set conf_handle_func_set;
-#ifdef CONFIG_PISA_PERFORMANCE
-#include "performance/pisaperf.h"
-#endif /* CONFIG_PISA_PERFORMANCE */
-
#define OPTS "f:i:p:q:bdvh"
/**
Modified: trunk/pisasd/sdmain.c
==============================================================================
--- trunk/pisasd/sdmain.c Mon Nov 2 17:46:00 2009 (r1492)
+++ trunk/pisasd/sdmain.c Mon Nov 2 17:52:18 2009 (r1493)
@@ -38,10 +38,7 @@
#include "libpisa/pisaconf.h"
#include "libpisa/scheduler.h"
#include "libpisa/log.h"
-
-#ifdef CONFIG_PISA_PERFORMANCE
-# include "performance/pisaperf.h"
-#endif
+#include "performance/pisaperf.h"
#define OPTS "f:i:p:q:a:bdvh"
Other related posts:
- » [pisa-src] r1493 - in trunk: performance/pisaperf.h pisacd/cdmain.c pisasd/sdmain.c - Thomas Jansen
