Repository: incubator-hawq
Updated Branches:
refs/heads/master 12d2bd635 -> 5ba4e7bd3
HAWQ-479: Update JSON-C from 0.6 to 0.12
- Uses new path `json-c/json.h` rather than `json/json.h`
Signed-off-by: Xin Zhang
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/5ba4e7bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/5ba4e7bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/5ba4e7bd
Branch: refs/heads/master
Commit: 5ba4e7bd32e35873b6e469097ba9746679179bfd
Parents: 12d2bd6
Author: Jacob Frank
Authored: Tue Mar 1 16:43:07 2016 -0800
Committer: Zak Auerbach
Committed: Thu Mar 3 15:00:57 2016 -0800
--
configure | 4 ++--
configure.in | 2 +-
src/backend/access/external/hd_work_mgr.c | 2 +-
src/backend/access/external/pxfanalyze.c | 2 +-
src/backend/access/external/pxfmasterapi.c | 2 +-
src/backend/catalog/hcatalog/externalmd.c | 2 +-
src/include/pg_config.h.in | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/5ba4e7bd/configure
--
diff --git a/configure b/configure
index 137fdb1..5135536 100755
--- a/configure
+++ b/configure
@@ -11145,9 +11145,9 @@ fi
# json-c
-for ac_header in json/json.h
+for ac_header in json-c/json.h
do :
- ac_fn_c_check_header_mongrel "$LINENO" "json/json.h"
"ac_cv_header_json_json_h" "$ac_includes_default"
+ ac_fn_c_check_header_mongrel "$LINENO" "json-c/json.h"
"ac_cv_header_json_json_h" "$ac_includes_default"
if test "x$ac_cv_header_json_json_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_JSON_JSON_H 1
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/5ba4e7bd/configure.in
--
diff --git a/configure.in b/configure.in
index fc1798c..cda7bad 100644
--- a/configure.in
+++ b/configure.in
@@ -1310,7 +1310,7 @@ fi
# json-c
-AC_CHECK_HEADERS(json/json.h, [], [AC_MSG_ERROR([json-c is required])])
+AC_CHECK_HEADERS(json-c/json.h, [], [AC_MSG_ERROR([json-c is required])])
AC_SEARCH_LIBS(json_tokener_parse, json-c json, [], [AC_MSG_ERROR([json-c is
required])], [])
# libxml2
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/5ba4e7bd/src/backend/access/external/hd_work_mgr.c
--
diff --git a/src/backend/access/external/hd_work_mgr.c
b/src/backend/access/external/hd_work_mgr.c
index 923bc81..61fd40e 100644
--- a/src/backend/access/external/hd_work_mgr.c
+++ b/src/backend/access/external/hd_work_mgr.c
@@ -27,7 +27,7 @@
#include "postgres.h"
#include
-#include
+#include
#include "access/pxfmasterapi.h"
#include "access/hd_work_mgr.h"
#include "access/libchurl.h"
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/5ba4e7bd/src/backend/access/external/pxfanalyze.c
--
diff --git a/src/backend/access/external/pxfanalyze.c
b/src/backend/access/external/pxfanalyze.c
index 01d0d3e..3a7ad27 100644
--- a/src/backend/access/external/pxfanalyze.c
+++ b/src/backend/access/external/pxfanalyze.c
@@ -25,7 +25,7 @@
#include "postgres.h"
#include
-#include
+#include
#include "access/hd_work_mgr.h"
#include "access/pxfanalyze.h"
#include "catalog/namespace.h"
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/5ba4e7bd/src/backend/access/external/pxfmasterapi.c
--
diff --git a/src/backend/access/external/pxfmasterapi.c
b/src/backend/access/external/pxfmasterapi.c
index b1a6240..17dbc65 100644
--- a/src/backend/access/external/pxfmasterapi.c
+++ b/src/backend/access/external/pxfmasterapi.c
@@ -25,7 +25,7 @@
*
*-
*/
-#include
+#include
#include "access/pxfmasterapi.h"
#include "catalog/hcatalog/externalmd.h"
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/5ba4e7bd/src/backend/catalog/hcatalog/externalmd.c
--
diff --git a/src/backend/catalog/hcatalog/externalmd.c
b/src/backend/catalog/hcatalog/externalmd.c
index a8b723f..3a7ebf7 100644
--- a/src/backend/catalog/hcatalog/externalmd.c
+++ b/src/backend/catalog/hcatalog/externalmd.c
@@ -28,7 +28,7 @@
*/
#include "postgres.h"
-#include
+#include
#include "miscadmin.h"
#include "access/transam.h"
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/5ba4e7bd/src/include/pg_config.h.in