diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2007-11-20 12:02:35 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2007-11-20 12:02:35 +0100 |
| commit | a021dbce94296f83bc5feb25a2aa99461bab057d (patch) | |
| tree | 648a3b5632d7e80006345540f0e2c1a1ddb266fe /py | |
| parent | Merge branch 'master' of cvs:/home/git/ice (diff) | |
| download | ice-a021dbce94296f83bc5feb25a2aa99461bab057d.tar.bz2 ice-a021dbce94296f83bc5feb25a2aa99461bab057d.tar.xz ice-a021dbce94296f83bc5feb25a2aa99461bab057d.zip | |
Fixed bug 2235, other minor fixes
Diffstat (limited to 'py')
| -rw-r--r-- | py/config/Make.rules | 4 | ||||
| -rw-r--r-- | py/config/Make.rules.Darwin | 2 | ||||
| -rw-r--r-- | py/modules/IcePy/Operation.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/py/config/Make.rules b/py/config/Make.rules index af6b8069a44..425d7306da0 100644 --- a/py/config/Make.rules +++ b/py/config/Make.rules @@ -139,7 +139,9 @@ UNAME := $(shell uname) # # Platform specific definitions # -ifeq ($(shell test -f $(ICE_DIR)/cpp/config/Make.rules.$(UNAME) && echo 0),0) +ifeq ($(shell test -f $(ICE_DIR)/../py/config/Make.rules.$(UNAME) && echo 0),0) + configdir = $(ICE_DIR)/../py/config +else ifeq ($(shell test -f $(ICE_DIR)/cpp/config/Make.rules.$(UNAME) && echo 0),0) configdir = $(ICE_DIR)/cpp/config else configdir = $(ICE_DIR)/config diff --git a/py/config/Make.rules.Darwin b/py/config/Make.rules.Darwin index 33050b01221..32b42f3e186 100644 --- a/py/config/Make.rules.Darwin +++ b/py/config/Make.rules.Darwin @@ -40,8 +40,6 @@ endif # CXXLIBS = -LDPLATFORMFLAGS = -Wl,-executable_path,$(top_srcdir)/bin - shlibldflags = $(CXXFLAGS) -L$(libdir) mkshlib = $(CXX) -bundle $(shlibldflags) -o $(1) $(3) $(4) diff --git a/py/modules/IcePy/Operation.cpp b/py/modules/IcePy/Operation.cpp index b98679030a5..2b64fb4f075 100644 --- a/py/modules/IcePy/Operation.cpp +++ b/py/modules/IcePy/Operation.cpp @@ -1362,7 +1362,7 @@ IcePy::SyncBlobjectInvocation::invoke(PyObject* args) throwPythonException(); } void* buf; - int sz; + Py_ssize_t sz; if(PyObject_AsWriteBuffer(ip.get(), &buf, &sz)) { throwPythonException(); @@ -1500,7 +1500,7 @@ IcePy::AsyncBlobjectInvocation::ice_response(bool ok, const pair<const Ice::Byte } void* buf; - int sz; + Py_ssize_t sz; if(PyObject_AsWriteBuffer(ip.get(), &buf, &sz)) { assert(PyErr_Occurred()); @@ -1928,7 +1928,7 @@ IcePy::BlobjectUpcall::dispatch(PyObject* servant, const pair<const Ice::Byte*, throwPythonException(); } void* buf; - int sz; + Py_ssize_t sz; if(PyObject_AsWriteBuffer(ip.get(), &buf, &sz)) { throwPythonException(); |