X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bindings%2Fsolv.i;h=61c6fc825d3f6249fc1fbef5e789ae01adc41e31;hb=5f5ff9576322b449fca131df791f4748e412df5f;hp=1882b1359150c712b4dc07cb50b400fff3fd3b70;hpb=4ddbcf346d1185bacbe63dba6e9317424b5206b9;p=platform%2Fupstream%2Flibsolv.git diff --git a/bindings/solv.i b/bindings/solv.i index 1882b13..61c6fc8 100644 --- a/bindings/solv.i +++ b/bindings/solv.i @@ -10,6 +10,12 @@ %markfunc Pool "mark_Pool"; #endif +#ifdef SWIGPYTHON +%begin %{ +#define PY_SSIZE_T_CLEAN +%} +#endif + /** ** binaryblob handling **/ @@ -63,13 +69,13 @@ typedef struct { $2 = size; } -%typemap(freearg,noblock=1,match="in") (const unsigned char *str, int len) { +%typemap(freearg,noblock=1,match="in") (const unsigned char *str, size_t len) { if (alloc$argnum == SWIG_NEWOBJ) %delete_array(buf$argnum); } %typemap(out,noblock=1,fragment="SWIG_FromCharPtrAndSize") BinaryBlob { #if defined(SWIGPYTHON) && defined(PYTHON3) - $result = $1.data ? Py_BuildValue("y#", $1.data, $1.len) : SWIG_Py_Void(); + $result = $1.data ? Py_BuildValue("y#", $1.data, (Py_ssize_t)$1.len) : SWIG_Py_Void(); #elif defined(SWIGTCL) Tcl_SetObjResult(interp, $1.data ? Tcl_NewByteArrayObj($1.data, $1.len) : NULL); #else @@ -1277,6 +1283,7 @@ typedef struct { static const Id SOLVER_ALLOWUNINSTALL = SOLVER_ALLOWUNINSTALL; static const Id SOLVER_FAVOR = SOLVER_FAVOR; static const Id SOLVER_DISFAVOR = SOLVER_DISFAVOR; + static const Id SOLVER_EXCLUDEFROMWEAK = SOLVER_EXCLUDEFROMWEAK; static const Id SOLVER_JOBMASK = SOLVER_JOBMASK; static const Id SOLVER_WEAK = SOLVER_WEAK; static const Id SOLVER_ESSENTIAL = SOLVER_ESSENTIAL;