Author: glen                         Date: Fri Jan 19 17:10:42 2007 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- compile fix for python 2.4 :
marshaller.cpp: In member function `bool
  PythonDCOP::Marshaller::marshalDict(const PythonDCOP::PCOPType&, const
  PythonDCOP::PCOPType&, PyObject*, QDataStream*) const':
marshaller.cpp:129: error: cannot convert `ssize_t*' to `int*' for argument `2'
  to `int PyDict_Next(PyObject*, int*, PyObject**, PyObject**)'
marshaller.cpp:138: error: cannot convert `ssize_t*' to `int*' for argument `2'
  to `int PyDict_Next(PyObject*, int*, PyObject**, PyObject**)'
make[1]: *** [marshaller.lo] Error 1
make[1]: Leaving directory 
`/home/builder/rpm/pld/BUILD/kdebindings-3.5.6/dcoppython/shell'
make: *** [all] Error 2

---- Files affected:
SOURCES:
   kdebindings-ssize_t.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/kdebindings-ssize_t.patch
diff -u /dev/null SOURCES/kdebindings-ssize_t.patch:1.1.2.1
--- /dev/null   Fri Jan 19 18:10:42 2007
+++ SOURCES/kdebindings-ssize_t.patch   Fri Jan 19 18:10:37 2007
@@ -0,0 +1,11 @@
+--- 
/home/builder/rpm/pld/BUILD/kdebindings-3.5.6/dcoppython/shell/marshaller.cpp~  
   2007-01-15 13:19:09.000000000 +0200
++++ 
/home/builder/rpm/pld/BUILD/kdebindings-3.5.6/dcoppython/shell/marshaller.cpp   
   2007-01-19 19:08:45.000000000 +0200
+@@ -124,7 +124,7 @@
+     if (!PyDict_Check(obj)) return false;
+ 
+ 
+-    ssize_t c=0;
++    Py_ssize_t c=0;
+     PyObject *key, *val;
+     while (PyDict_Next(obj, &c, &key, &val)==1)
+       if (!key_type.isMarshallable(key) ||
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to