From 4db6e439716e76f321c97006fa7a40d227edb732 Mon Sep 17 00:00:00 2001
From: Vas Crabb <vas@vastheman.com>
Date: Sat, 4 Feb 2017 12:29:23 +1100
Subject: [PATCH] Avoid conflict with Apple C++ runtime header nl_types.h

---
 src/lib/netlist/{nl_types.h => netlist_types.h} | 14 +++++++-------
 src/lib/netlist/nl_lists.h                      |  2 +-
 src/lib/netlist/nl_setup.h                      |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename src/lib/netlist/{nl_types.h => netlist_types.h} (89%)

diff --git a/src/lib/netlist/nl_types.h b/src/lib/netlist/netlist_types.h
similarity index 89%
rename from src/lib/netlist/nl_types.h
rename to src/lib/netlist/netlist_types.h
index 365b0e19868..c7c4aef4750 100644
--- a/src/lib/netlist/nl_types.h
+++ b/src/lib/netlist/netlist_types.h
@@ -2,12 +2,12 @@
 // copyright-holders:Couriersud
 /*!
  *
- * \file nl_types.h
+ * \file netlist_types.h
  *
  */
 
-#ifndef NLTYPES_H_
-#define NLTYPES_H_
+#ifndef NETLIST_TYPES_H_
+#define NETLIST_TYPES_H_
 
 #include <cstdint>
 #include <unordered_map>
@@ -22,13 +22,13 @@ namespace netlist
 	//  Performance tracking
 	//============================================================
 
-	#if NL_KEEP_STATISTICS
+#if NL_KEEP_STATISTICS
 	using nperftime_t = plib::chrono::timer<plib::chrono::exact_ticks, true>;
 	using nperfcount_t = plib::chrono::counter<true>;
-	#else
+#else
 	using nperftime_t = plib::chrono::timer<plib::chrono::exact_ticks, false>;
 	using nperfcount_t = plib::chrono::counter<false>;
-	#endif
+#endif
 
 	//============================================================
 	//  Types needed by various includes
@@ -51,4 +51,4 @@ namespace netlist
 	}
 }
 
-#endif /* NLTYPES_H_ */
+#endif /* NETLIST_TYPES_H_ */
diff --git a/src/lib/netlist/nl_lists.h b/src/lib/netlist/nl_lists.h
index 0461a445ff2..4c6935bd7d4 100644
--- a/src/lib/netlist/nl_lists.h
+++ b/src/lib/netlist/nl_lists.h
@@ -15,7 +15,7 @@
 #include <mutex>
 
 #include "nl_config.h"
-#include "nl_types.h"
+#include "netlist_types.h"
 #include "plib/plists.h"
 #include "plib/pchrono.h"
 #include "plib/ptypes.h"
diff --git a/src/lib/netlist/nl_setup.h b/src/lib/netlist/nl_setup.h
index 4ee449a06a8..e9fc0861328 100644
--- a/src/lib/netlist/nl_setup.h
+++ b/src/lib/netlist/nl_setup.h
@@ -15,7 +15,7 @@
 
 #include "nl_factory.h"
 #include "nl_config.h"
-#include "nl_types.h"
+#include "netlist_types.h"
 
 #include <stack>
 #include <vector>