From 5f3575425d6e485bc2fed9dfc295ae4fb191d0f7 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@ncsa.illinois.edu>
Date: Thu, 17 May 2012 15:26:28 -0500
Subject: [PATCH] Fix compile errors.

Preprocess out DataSeries.cc based on config.h's USE_DATASERIES value
and one reference to threading::Field needed scoping.
---
 src/logging/Manager.cc            | 2 +-
 src/logging/writers/DataSeries.cc | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/logging/Manager.cc b/src/logging/Manager.cc
index f78e47da73..34d10a1abf 100644
--- a/src/logging/Manager.cc
+++ b/src/logging/Manager.cc
@@ -466,7 +466,7 @@ bool Manager::TraverseRecord(Stream* stream, Filter* filter, RecordType* rt,
 
 		filter->fields = (threading::Field**)
 			realloc(filter->fields,
-				sizeof(Field) * ++filter->num_fields);
+				sizeof(threading::Field) * ++filter->num_fields);
 
 		if ( ! filter->fields )
 			{
diff --git a/src/logging/writers/DataSeries.cc b/src/logging/writers/DataSeries.cc
index 9f19028be3..1d5a6ea4da 100644
--- a/src/logging/writers/DataSeries.cc
+++ b/src/logging/writers/DataSeries.cc
@@ -1,5 +1,9 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
+#include "config.h"
+
+#ifdef USE_DATASERIES
+
 #include <map>
 #include <string>
 #include <errno.h>
@@ -415,3 +419,5 @@ bool DataSeries::DoSetBuf(bool enabled)
 	// DataSeries is *always* buffered to some degree.  This option is ignored.
 	return true;
 }
+
+#endif /* USE_DATASERIES */