From 00b979f086587046266f862f2a645cce02c485dc Mon Sep 17 00:00:00 2001
From: Jordan Bayles <jophba@chromium.org>
Date: Wed, 25 Sep 2019 14:04:53 -0700
Subject: [PATCH] Issue #970: Rename features.h to json_features.h (#1024)

This patch fixes a build issue on CMake, presumably due to the new glibc
having a features.h include file. This patch renames our features.h file
to avoid a name collision.
---
 amalgamate.py                                | 2 +-
 include/json/forwards.h                      | 2 +-
 include/json/json.h                          | 2 +-
 include/json/{features.h => json_features.h} | 0
 include/json/reader.h                        | 2 +-
 meson.build                                  | 2 +-
 src/lib_json/CMakeLists.txt                  | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename include/json/{features.h => json_features.h} (100%)

diff --git a/amalgamate.py b/amalgamate.py
index 7b41e2e..fedee1e 100755
--- a/amalgamate.py
+++ b/amalgamate.py
@@ -75,7 +75,7 @@ def amalgamate_source(source_top_dir=None,
     header.add_file(os.path.join(INCLUDE_PATH, "allocator.h"))
     header.add_file(os.path.join(INCLUDE_PATH, "config.h"))
     header.add_file(os.path.join(INCLUDE_PATH, "forwards.h"))
-    header.add_file(os.path.join(INCLUDE_PATH, "features.h"))
+    header.add_file(os.path.join(INCLUDE_PATH, "json_features.h"))
     header.add_file(os.path.join(INCLUDE_PATH, "value.h"))
     header.add_file(os.path.join(INCLUDE_PATH, "reader.h"))
     header.add_file(os.path.join(INCLUDE_PATH, "writer.h"))
diff --git a/include/json/forwards.h b/include/json/forwards.h
index 958b5bc..b0d981b 100644
--- a/include/json/forwards.h
+++ b/include/json/forwards.h
@@ -25,7 +25,7 @@ class Reader;
 class CharReader;
 class CharReaderBuilder;
 
-// features.h
+// json_features.h
 class Features;
 
 // value.h
diff --git a/include/json/json.h b/include/json/json.h
index 19f14c2..f1b679a 100644
--- a/include/json/json.h
+++ b/include/json/json.h
@@ -7,7 +7,7 @@
 #define JSON_JSON_H_INCLUDED
 
 #include "autolink.h"
-#include "features.h"
+#include "json_features.h"
 #include "reader.h"
 #include "value.h"
 #include "writer.h"
diff --git a/include/json/features.h b/include/json/json_features.h
similarity index 100%
rename from include/json/features.h
rename to include/json/json_features.h
diff --git a/include/json/reader.h b/include/json/reader.h
index 8b388b0..fb2365a 100644
--- a/include/json/reader.h
+++ b/include/json/reader.h
@@ -7,7 +7,7 @@
 #define CPPTL_JSON_READER_H_INCLUDED
 
 #if !defined(JSON_IS_AMALGAMATION)
-#include "features.h"
+#include "json_features.h"
 #include "value.h"
 #endif // if !defined(JSON_IS_AMALGAMATION)
 #include <deque>
diff --git a/meson.build b/meson.build
index d1f4989..65dcffa 100644
--- a/meson.build
+++ b/meson.build
@@ -23,7 +23,7 @@ jsoncpp_headers = [
   'include/json/assertions.h',
   'include/json/autolink.h',
   'include/json/config.h',
-  'include/json/features.h',
+  'include/json/json_features.h',
   'include/json/forwards.h',
   'include/json/json.h',
   'include/json/reader.h',
diff --git a/src/lib_json/CMakeLists.txt b/src/lib_json/CMakeLists.txt
index 0fa2f59..a9bf786 100644
--- a/src/lib_json/CMakeLists.txt
+++ b/src/lib_json/CMakeLists.txt
@@ -42,7 +42,7 @@ set( JSONCPP_INCLUDE_DIR ../../include )
 set( PUBLIC_HEADERS
     ${JSONCPP_INCLUDE_DIR}/json/config.h
     ${JSONCPP_INCLUDE_DIR}/json/forwards.h
-    ${JSONCPP_INCLUDE_DIR}/json/features.h
+    ${JSONCPP_INCLUDE_DIR}/json/json_features.h
     ${JSONCPP_INCLUDE_DIR}/json/value.h
     ${JSONCPP_INCLUDE_DIR}/json/reader.h
     ${JSONCPP_INCLUDE_DIR}/json/version.h