Remove json_object_private.h because of json-c upgrade

Change-Id: If06a187e350b9397934a7b1d3e2949cb7eab98d7

diff --git a/packaging/murphy.spec b/packaging/murphy.spec
index 42a4e9d2e60209acfe0fab76d056bc60135a566b..bf5c92f40a4e717db476558f8d06f03a6765d30d 100644 (file)
--- a/packaging/murphy.spec
+++ b/packaging/murphy.spec
@@ -29,7 +29,7 @@
 Summary: Resource policy framework
 Name: murphy
 Version: 0.0.75
-Release: 27
+Release: 28
 License: BSD-3-Clause
 Group: System/Service
 URL: http://01.org/murphy/

diff --git a/src/common/json.h b/src/common/json.h
index c6d5cbc65d7307fc2682770d67c167f77388aa8f..51e2730ed9b230913da36f13ddcdccca7c10f6a3 100644 (file)
--- a/src/common/json.h
+++ b/src/common/json.h
@@ -38,13 +38,9 @@
 #ifndef JSON_INCLUDE_PATH_JSONC
 #    include <json/json.h>
 #    include <json/linkhash.h>
-/* workaround for older broken json-c not exposing json_object_iter */
-#    include <json/json_object_private.h>
 #else
 #    include <json-c/json.h>
 #    include <json-c/linkhash.h>
-/* workaround for older broken json-c not exposing json_object_iter */
-#    include <json-c/json_object_private.h>
 #endif
 
 #include <murphy/common/macros.h>