You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2013/12/17 17:28:24 UTC
svn commit: r1551607 - in /qpid/dispatch/trunk: CMakeLists.txt
src/conditionals.h.in src/container.c
Author: tross
Date: Tue Dec 17 16:28:23 2013
New Revision: 1551607
URL: http://svn.apache.org/r1551607
Log:
NO-JIRA - Removed conditional build for pn_link_get_drain.
- This code base now depends on Proton 0.6 (or trunk as of this time).
Modified:
qpid/dispatch/trunk/CMakeLists.txt
qpid/dispatch/trunk/src/conditionals.h.in
qpid/dispatch/trunk/src/container.c
Modified: qpid/dispatch/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/CMakeLists.txt?rev=1551607&r1=1551606&r2=1551607&view=diff
==============================================================================
--- qpid/dispatch/trunk/CMakeLists.txt (original)
+++ qpid/dispatch/trunk/CMakeLists.txt Tue Dec 17 16:28:23 2013
@@ -78,11 +78,6 @@ include_directories(
set(CMAKE_C_FLAGS "-pthread -Wall -Werror -std=gnu99")
set(CATCH_UNDEFINED "-Wl,--no-undefined")
-set (CMAKE_REQUIRED_FLAGS "-lqpid-proton")
-set (CMAKE_REQUIRED_INCLUDES ${proton_include})
-set (CMAKE_REQUIRED_LIBRARIES ${proton_lib})
-check_function_exists(pn_link_get_drain HAVE_LINK_GET_DRAIN)
-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/conditionals.h.in
${CMAKE_CURRENT_BINARY_DIR}/conditionals.h)
Modified: qpid/dispatch/trunk/src/conditionals.h.in
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/conditionals.h.in?rev=1551607&r1=1551606&r2=1551607&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/conditionals.h.in (original)
+++ qpid/dispatch/trunk/src/conditionals.h.in Tue Dec 17 16:28:23 2013
@@ -17,5 +17,5 @@
* under the License.
*/
-#cmakedefine HAVE_LINK_GET_DRAIN "${HAVE_LINK_GET_DRAIN}"
+
Modified: qpid/dispatch/trunk/src/container.c
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/container.c?rev=1551607&r1=1551606&r2=1551607&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/container.c (original)
+++ qpid/dispatch/trunk/src/container.c Tue Dec 17 16:28:23 2013
@@ -33,13 +33,6 @@
#include <qpid/dispatch/agent.h>
#include "conditionals.h"
-#ifndef HAVE_LINK_GET_DRAIN
-static bool pn_link_get_drain(pn_link_t *link)
-{
- return false;
-}
-#endif
-
static char *module="CONTAINER";
struct qd_node_t {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org