diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-12-04 18:49:03 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-12-04 18:49:10 +0900 |
| commit | f5c4d891252bd3c913f20c3c604982573692fa86 (patch) | |
| tree | 433866ac4c85dc26421e62385f500d46523b58bc /python | |
| parent | 89d86b9956699671509e3758f2245ecf95571f15 (diff) | |
| download | libxslt-f5c4d891252bd3c913f20c3c604982573692fa86.tar.gz libxslt-f5c4d891252bd3c913f20c3c604982573692fa86.tar.bz2 libxslt-f5c4d891252bd3c913f20c3c604982573692fa86.zip | |
Imported Upstream version 1.1.32upstream/1.1.32
Change-Id: I03b39e92b2b7898e9a34a1e240722003e7d51cd8
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'python')
| -rw-r--r-- | python/Makefile.in | 2 | ||||
| -rw-r--r-- | python/libxslt.c | 10 | ||||
| -rw-r--r-- | python/tests/Makefile.in | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/python/Makefile.in b/python/Makefile.in index c2758df2..58590f73 100644 --- a/python/Makefile.in +++ b/python/Makefile.in @@ -372,8 +372,6 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ -XSLT_LOCALE_WINAPI = @XSLT_LOCALE_WINAPI@ -XSLT_LOCALE_XLOCALE = @XSLT_LOCALE_XLOCALE@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/python/libxslt.c b/python/libxslt.c index 8dd6c788..b1fb18de 100644 --- a/python/libxslt.c +++ b/python/libxslt.c @@ -21,6 +21,7 @@ #include "libxslt-py.h" #include <stdio.h> +#include <stddef.h> #if (defined(_MSC_VER) || defined(__MINGW32__)) && !defined(vsnprintf) #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a) @@ -105,7 +106,7 @@ libxslt_xsltGetTransformContextHashCode(PyObject *self ATTRIBUTE_UNUSED, PyObjec return NULL; tctxt = (xsltTransformContextPtr) PytransformCtxt_Get(py_tctxt); - hash_code = (long) tctxt; + hash_code = (ptrdiff_t) tctxt; ret = PyInt_FromLong(hash_code); return ret; @@ -142,7 +143,7 @@ libxslt_xsltGetStylesheetHashCode(PyObject *self ATTRIBUTE_UNUSED, PyObject *arg return NULL; style = (xsltStylesheetPtr) Pystylesheet_Get(py_style); - hash_code = (long) style; + hash_code = (ptrdiff_t) style; ret = PyInt_FromLong(hash_code); return ret; @@ -857,7 +858,7 @@ libxslt_xsltSaveResultToString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) static PyObject *libxslt_xsltPythonErrorFuncHandler = NULL; static PyObject *libxslt_xsltPythonErrorFuncCtxt = NULL; -static void +static void LIBXSLT_ATTR_FORMAT(2,3) libxslt_xsltErrorFuncHandler(void *ctx ATTRIBUTE_UNUSED, const char *msg, ...) { @@ -1180,7 +1181,6 @@ extern void initlibxml2mod(void); void initlibxsltmod(void) { static int initialized = 0; - PyObject *m; #ifdef MERGED_MODULES initlibxml2mod(); @@ -1188,7 +1188,7 @@ void initlibxsltmod(void) { if (initialized != 0) return; - m = Py_InitModule((char *)"libxsltmod", libxsltMethods); + Py_InitModule((char *)"libxsltmod", libxsltMethods); initialized = 1; /* * Specific XSLT initializations diff --git a/python/tests/Makefile.in b/python/tests/Makefile.in index 1f087a7c..55e5b523 100644 --- a/python/tests/Makefile.in +++ b/python/tests/Makefile.in @@ -242,8 +242,6 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ -XSLT_LOCALE_WINAPI = @XSLT_LOCALE_WINAPI@ -XSLT_LOCALE_XLOCALE = @XSLT_LOCALE_XLOCALE@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ |