You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ns...@apache.org on 2016/01/23 17:27:30 UTC
thrift git commit: THRIFT-3572 Fix "Unable to determine the behavior
of a signed right shift" Client: Build (c_glib) Patch: Chandler May
Repository: thrift
Updated Branches:
refs/heads/master 9890c28b7 -> ccd998a04
THRIFT-3572 Fix "Unable to determine the behavior of a signed right shift"
Client: Build (c_glib)
Patch: Chandler May
This closes #816
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/ccd998a0
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/ccd998a0
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/ccd998a0
Branch: refs/heads/master
Commit: ccd998a04e8b82a56b1788aa13167e84aa2126d1
Parents: 9890c28
Author: Chandler May <cj...@gmail.com>
Authored: Sun Jan 10 06:01:10 2016 +0000
Committer: Nobuaki Sukegawa <ns...@apache.org>
Committed: Sun Jan 24 01:26:33 2016 +0900
----------------------------------------------------------------------
.gitignore | 1 +
configure.ac | 1 +
lib/c_glib/CMakeLists.txt | 3 +++
lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol.c | 2 ++
4 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/ccd998a0/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 5dad747..afcb8d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,6 +122,7 @@ erl_crash.dump
/lib/c_glib/*.gcda
/lib/c_glib/*.gcno
/lib/c_glib/*.loT
+/lib/c_glib/src/thrift/config.h
/lib/c_glib/test/*.gcno
/lib/c_glib/test/testwrapper.sh
/lib/c_glib/test/testwrapper-test*
http://git-wip-us.apache.org/repos/asf/thrift/blob/ccd998a0/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 615c301..7dc5649 100755
--- a/configure.ac
+++ b/configure.ac
@@ -689,6 +689,7 @@ AM_CONDITIONAL([WITH_BOOSTTHREADS], [test "x[$]ENABLE_BOOSTTHREADS" = "x1"])
AC_CONFIG_HEADERS(config.h:config.hin)
AC_CONFIG_HEADERS(lib/cpp/src/thrift/config.h:config.hin)
+AC_CONFIG_HEADERS(lib/c_glib/src/thrift/config.h:config.hin)
# gruard against pre defined config.h
AH_TOP([
#ifndef CONFIG_H
http://git-wip-us.apache.org/repos/asf/thrift/blob/ccd998a0/lib/c_glib/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/lib/c_glib/CMakeLists.txt b/lib/c_glib/CMakeLists.txt
index b409fbe..04bdba7 100644
--- a/lib/c_glib/CMakeLists.txt
+++ b/lib/c_glib/CMakeLists.txt
@@ -62,6 +62,9 @@ TARGET_LINK_LIBRARIES_THRIFT(thrift_c_glib ${SYSLIBS})
# Install the headers
install(DIRECTORY "src/thrift" DESTINATION "${INCLUDE_INSTALL_DIR}"
FILES_MATCHING PATTERN "*.h")
+# Copy config.h file
+install(DIRECTORY "${CMAKE_BINARY_DIR}/thrift" DESTINATION "${INCLUDE_INSTALL_DIR}"
+ FILES_MATCHING PATTERN "*.h")
if(BUILD_TESTING)
add_subdirectory(test)
http://git-wip-us.apache.org/repos/asf/thrift/blob/ccd998a0/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol.c
----------------------------------------------------------------------
diff --git a/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol.c b/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol.c
index 1b36904..5ff33b3 100644
--- a/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol.c
+++ b/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol.c
@@ -24,6 +24,8 @@
#include <thrift/c_glib/protocol/thrift_protocol.h>
#include <thrift/c_glib/protocol/thrift_compact_protocol.h>
+#include <thrift/config.h>
+
/*
* *_to_zigzag depend on the fact that the right shift
* operator on a signed integer is an arithmetic (sign-extending) shift.