Skip to content

Commit 00b979f

Browse files
authored
Issue open-source-parsers#970: Rename features.h to json_features.h (open-source-parsers#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.
1 parent ae4dc9a commit 00b979f

File tree

7 files changed

+6
-6
lines changed

7 files changed

+6
-6
lines changed

amalgamate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def amalgamate_source(source_top_dir=None,
7575
header.add_file(os.path.join(INCLUDE_PATH, "allocator.h"))
7676
header.add_file(os.path.join(INCLUDE_PATH, "config.h"))
7777
header.add_file(os.path.join(INCLUDE_PATH, "forwards.h"))
78-
header.add_file(os.path.join(INCLUDE_PATH, "features.h"))
78+
header.add_file(os.path.join(INCLUDE_PATH, "json_features.h"))
7979
header.add_file(os.path.join(INCLUDE_PATH, "value.h"))
8080
header.add_file(os.path.join(INCLUDE_PATH, "reader.h"))
8181
header.add_file(os.path.join(INCLUDE_PATH, "writer.h"))

include/json/forwards.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class Reader;
2525
class CharReader;
2626
class CharReaderBuilder;
2727

28-
// features.h
28+
// json_features.h
2929
class Features;
3030

3131
// value.h

include/json/json.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define JSON_JSON_H_INCLUDED
88

99
#include "autolink.h"
10-
#include "features.h"
10+
#include "json_features.h"
1111
#include "reader.h"
1212
#include "value.h"
1313
#include "writer.h"
File renamed without changes.

include/json/reader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define CPPTL_JSON_READER_H_INCLUDED
88

99
#if !defined(JSON_IS_AMALGAMATION)
10-
#include "features.h"
10+
#include "json_features.h"
1111
#include "value.h"
1212
#endif // if !defined(JSON_IS_AMALGAMATION)
1313
#include <deque>

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jsoncpp_headers = [
2323
'include/json/assertions.h',
2424
'include/json/autolink.h',
2525
'include/json/config.h',
26-
'include/json/features.h',
26+
'include/json/json_features.h',
2727
'include/json/forwards.h',
2828
'include/json/json.h',
2929
'include/json/reader.h',

src/lib_json/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ set( JSONCPP_INCLUDE_DIR ../../include )
4242
set( PUBLIC_HEADERS
4343
${JSONCPP_INCLUDE_DIR}/json/config.h
4444
${JSONCPP_INCLUDE_DIR}/json/forwards.h
45-
${JSONCPP_INCLUDE_DIR}/json/features.h
45+
${JSONCPP_INCLUDE_DIR}/json/json_features.h
4646
${JSONCPP_INCLUDE_DIR}/json/value.h
4747
${JSONCPP_INCLUDE_DIR}/json/reader.h
4848
${JSONCPP_INCLUDE_DIR}/json/version.h

0 commit comments

Comments
 (0)