4 files changed, 23 insertions, 21 deletions
diff --git a/cpp/bindings/qpid/python/Makefile.am b/cpp/bindings/qpid/python/Makefile.am
index 6701ce0ac3..0085a762e3 100644
--- a/cpp/bindings/qpid/python/Makefile.am
+++ b/cpp/bindings/qpid/python/Makefile.am
@@ -22,25 +22,25 @@ if HAVE_PYTHON_DEVEL
 INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src/qmf -I$(top_srcdir)/src -I$(top_builddir)/src
 
 generated_file_list = \
-	qpidw.cpp \
-	qpidw.py
+	cqpid.cpp \
+	cqpid.py
 
 EXTRA_DIST = python.i
 BUILT_SOURCES = $(generated_file_list)
 
 $(generated_file_list): $(srcdir)/python.i $(srcdir)/../qpid.i $(srcdir)/../../swig_python_typemaps.i
-	swig -c++ -python -Wall $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -I/usr/include -o qpidw.cpp $(srcdir)/python.i
+	swig -c++ -python -Wall $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -I/usr/include -o cqpid.cpp $(srcdir)/python.i
 
 pylibdir = $(PYTHON_LIB)
 
-lib_LTLIBRARIES = _qpidw.la
+lib_LTLIBRARIES = _cqpid.la
 
-#_qpidw_la_LDFLAGS = -avoid-version -module -shrext "$(PYTHON_SO)"
-#_qpidw_la_LDFLAGS = -avoid-version -module -shrext ".so"
-_qpidw_la_LDFLAGS = -avoid-version -module -shared
-_qpidw_la_LIBADD = $(PYTHON_LIBS) -L$(top_builddir)/src/.libs -lqpidmessaging -lqpidtypes $(top_builddir)/src/libqpidmessaging.la $(top_builddir)/src/libqpidtypes.la
-_qpidw_la_CXXFLAGS = $(INCLUDES) -I$(PYTHON_INC)
-nodist__qpidw_la_SOURCES = qpidw.cpp
+#_cqpid_la_LDFLAGS = -avoid-version -module -shrext "$(PYTHON_SO)"
+#_cqpid_la_LDFLAGS = -avoid-version -module -shrext ".so"
+_cqpid_la_LDFLAGS = -avoid-version -module -shared
+_cqpid_la_LIBADD = $(PYTHON_LIBS) -L$(top_builddir)/src/.libs -lqpidmessaging -lqpidtypes $(top_builddir)/src/libqpidmessaging.la $(top_builddir)/src/libqpidtypes.la
+_cqpid_la_CXXFLAGS = $(INCLUDES) -I$(PYTHON_INC)
+nodist__cqpid_la_SOURCES = cqpid.cpp
 
 CLEANFILES = $(generated_file_list)
 
diff --git a/cpp/bindings/qpid/python/python.i b/cpp/bindings/qpid/python/python.i
index 690ce57d85..85dc745783 100644
--- a/cpp/bindings/qpid/python/python.i
+++ b/cpp/bindings/qpid/python/python.i
@@ -17,14 +17,16 @@
  * under the License.
  */
 
-%module qpidw
+%module cqpid
 %include "std_string.i"
 %include "../../swig_python_typemaps.i"
 
 /* Define the general-purpose exception handling */
 %exception {
     try {
+        Py_BEGIN_ALLOW_THREADS
         $action
+        Py_END_ALLOW_THREADS
     }
     catch (qpid::messaging::MessagingException& mex) {
         PyErr_SetString(PyExc_RuntimeError, mex.what());
diff --git a/cpp/bindings/qpid/ruby/Makefile.am b/cpp/bindings/qpid/ruby/Makefile.am
index cb187f8dc3..fd23ace52e 100644
--- a/cpp/bindings/qpid/ruby/Makefile.am
+++ b/cpp/bindings/qpid/ruby/Makefile.am
@@ -22,22 +22,22 @@ if HAVE_RUBY_DEVEL
 INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src
 
 EXTRA_DIST = ruby.i
-BUILT_SOURCES = qpidw.cpp
+BUILT_SOURCES = cqpid.cpp
 
 rubylibdir = $(RUBY_LIB)
 
-qpidw.cpp: $(srcdir)/ruby.i $(srcdir)/../qpid.i $(srcdir)/../../swig_ruby_typemaps.i
-	$(SWIG) -ruby -c++ -Wall $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o qpidw.cpp $(srcdir)/ruby.i
+cqpid.cpp: $(srcdir)/ruby.i $(srcdir)/../qpid.i $(srcdir)/../../swig_ruby_typemaps.i
+	$(SWIG) -ruby -c++ -Wall $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o cqpid.cpp $(srcdir)/ruby.i
 
 rubylibarchdir = $(RUBY_LIB_ARCH)
-rubylibarch_LTLIBRARIES = qpidw.la
+rubylibarch_LTLIBRARIES = cqpid.la
 
-qpidw_la_LDFLAGS = -avoid-version -module -shrext ".$(RUBY_DLEXT)"
-qpidw_la_LIBADD = $(RUBY_LIBS) -L$(top_builddir)/src/.libs -lqpidmessaging -lqpidtypes \
+cqpid_la_LDFLAGS = -avoid-version -module -shrext ".$(RUBY_DLEXT)"
+cqpid_la_LIBADD = $(RUBY_LIBS) -L$(top_builddir)/src/.libs -lqpidmessaging -lqpidtypes \
 	$(top_builddir)/src/libqpidmessaging.la $(top_builddir)/src/libqpidtypes.la
-qpidw_la_CXXFLAGS = $(INCLUDES) -I$(RUBY_INC) -I$(RUBY_INC_ARCH)
-nodist_qpidw_la_SOURCES = qpidw.cpp
+cqpid_la_CXXFLAGS = $(INCLUDES) -I$(RUBY_INC) -I$(RUBY_INC_ARCH)
+nodist_cqpid_la_SOURCES = cqpid.cpp
 
-CLEANFILES = qpidw.cpp
+CLEANFILES = cqpid.cpp
 
 endif # HAVE_RUBY_DEVEL
diff --git a/cpp/bindings/qpid/ruby/ruby.i b/cpp/bindings/qpid/ruby/ruby.i
index baabeaede2..76463f7ddd 100644
--- a/cpp/bindings/qpid/ruby/ruby.i
+++ b/cpp/bindings/qpid/ruby/ruby.i
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-%module qpidw
+%module cqpid
 %include "std_string.i"
 %include "../../swig_ruby_typemaps.i"