From f5c4d891252bd3c913f20c3c604982573692fa86 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Mon, 4 Dec 2017 18:49:03 +0900 Subject: Imported Upstream version 1.1.32 Change-Id: I03b39e92b2b7898e9a34a1e240722003e7d51cd8 Signed-off-by: DongHun Kwak --- Makefile.in | 2 - config.h.in | 3 + configure | 112 +++++++------------------------------- configure.ac | 72 +----------------------- doc/APIchunk1.html | 5 +- doc/APIchunk10.html | 5 +- doc/APIchunk11.html | 7 ++- doc/APIchunk2.html | 4 +- doc/APIchunk4.html | 3 + doc/APIchunk6.html | 2 + doc/APIchunk7.html | 2 + doc/APIfiles.html | 2 + doc/APIsymbols.html | 2 + doc/Makefile.in | 2 - doc/html/libxslt-xsltlocale.html | 6 +- doc/libxslt-api.xml | 10 +++- doc/libxslt-refs.xml | 30 +++++++++- libexslt/Makefile.in | 2 - libexslt/common.c | 2 +- libexslt/crypto.c | 24 ++++---- libexslt/date.c | 7 ++- libexslt/dynamic.c | 2 +- libexslt/functions.c | 2 +- libexslt/libexslt.h | 2 +- libexslt/math.c | 2 +- libexslt/saxon.c | 2 +- libexslt/sets.c | 2 +- libexslt/strings.c | 2 +- libxslt.spec | 6 +- libxslt/Makefile.in | 2 - libxslt/libxslt.h | 2 +- libxslt/security.c | 6 +- libxslt/transform.c | 4 +- libxslt/xslt.c | 1 + libxslt/xsltconfig.h.in | 13 ----- libxslt/xsltlocale.c | 25 ++++----- libxslt/xsltlocale.h | 29 ++++++---- libxslt/xsltutils.c | 14 ++--- python/Makefile.in | 2 - python/libxslt.c | 10 ++-- python/tests/Makefile.in | 2 - tests/Makefile.in | 2 - tests/REC/Makefile.in | 2 - tests/REC1/Makefile.in | 2 - tests/REC2/Makefile.in | 2 - tests/XSLTMark/Makefile.in | 2 - tests/docbook/Makefile.in | 2 - tests/docs/Makefile.in | 2 - tests/documents/Makefile.in | 2 - tests/exslt/Makefile.in | 2 - tests/exslt/common/Makefile.in | 2 - tests/exslt/crypto/Makefile.in | 2 - tests/exslt/date/Makefile.in | 2 - tests/exslt/dynamic/Makefile.in | 2 - tests/exslt/functions/Makefile.in | 2 - tests/exslt/math/Makefile.in | 2 - tests/exslt/saxon/Makefile.in | 2 - tests/exslt/sets/Makefile.in | 2 - tests/exslt/strings/Makefile.in | 2 - tests/extensions/Makefile.in | 2 - tests/general/Makefile.am | 4 +- tests/general/Makefile.in | 6 +- tests/keys/Makefile.in | 2 - tests/multiple/Makefile.in | 2 - tests/namespaces/Makefile.in | 2 - tests/numbers/Makefile.in | 2 - tests/plugins/Makefile.in | 2 - tests/reports/Makefile.in | 2 - tests/xinclude/Makefile.in | 2 - tests/xmlspec/Makefile.in | 2 - win32/Makefile.msvc | 2 +- win32/configure.js | 9 --- win32/libxslt.def.src | 2 + win32/libxslt/libxslt_so.dsp | 8 +-- win32/libxslt/xsltproc.dsp | 8 +-- win32/runtests.py | 2 +- xsltproc/Makefile.in | 2 - xsltproc/testThreads.c | 2 + xsltproc/xsltproc.c | 18 +++--- 79 files changed, 193 insertions(+), 358 deletions(-) diff --git a/Makefile.in b/Makefile.in index ce8c9ee4..dc09261c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -359,8 +359,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/config.h.in b/config.h.in index 48c6f82d..8aa285b0 100644 --- a/config.h.in +++ b/config.h.in @@ -105,6 +105,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H +/* Define to 1 if you have the `strxfrm_l' function. */ +#undef HAVE_STRXFRM_L + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SELECT_H diff --git a/configure b/configure index 70bbffb6..b94c2c53 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libxslt 1.1.31. +# Generated by GNU Autoconf 2.69 for libxslt 1.1.32. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libxslt' PACKAGE_TARNAME='libxslt' -PACKAGE_VERSION='1.1.31' -PACKAGE_STRING='libxslt 1.1.31' +PACKAGE_VERSION='1.1.32' +PACKAGE_STRING='libxslt 1.1.32' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -676,8 +676,6 @@ WITH_PERL_FALSE WITH_PERL_TRUE PERL WITH_TRIO -XSLT_LOCALE_WINAPI -XSLT_LOCALE_XLOCALE THREAD_LIBS USE_VERSION_SCRIPT_FALSE USE_VERSION_SCRIPT_TRUE @@ -1398,7 +1396,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libxslt 1.1.31 to adapt to many kinds of systems. +\`configure' configures libxslt 1.1.32 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1468,7 +1466,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libxslt 1.1.31:";; + short | recursive ) echo "Configuration of libxslt 1.1.32:";; esac cat <<\_ACEOF @@ -1600,7 +1598,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libxslt configure 1.1.31 +libxslt configure 1.1.32 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1965,7 +1963,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libxslt $as_me 1.1.31, which was +It was created by libxslt $as_me 1.1.32, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3729,10 +3727,10 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } LIBXSLT_MAJOR_VERSION=1 LIBXSLT_MINOR_VERSION=1 -LIBXSLT_MICRO_VERSION=31 +LIBXSLT_MICRO_VERSION=32 LIBEXSLT_MAJOR_VERSION=0 LIBEXSLT_MINOR_VERSION=8 -LIBEXSLT_MICRO_VERSION=19 +LIBEXSLT_MICRO_VERSION=20 LIBXML_REQUIRED_VERSION=2.6.27 @@ -4340,7 +4338,7 @@ fi # Define the identity of the package. PACKAGE='libxslt' - VERSION='1.1.31' + VERSION='1.1.32' cat >>confdefs.h <<_ACEOF @@ -13670,9 +13668,6 @@ esac -XSLT_LOCALE_XLOCALE=0 -XSLT_LOCALE_WINAPI=0 - for ac_header in locale.h xlocale.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -13686,85 +13681,16 @@ fi done -if test $ac_cv_header_xlocale_h = yes; then -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if xlocale program link" >&5 -$as_echo_n "checking if xlocale program link... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#ifdef HAVE_LOCALE_H -#include -#endif -#ifdef HAVE_XLOCALE_H -#include -#endif -#ifdef HAVE_STRING_H -#include -#endif -#ifdef HAVE_STDLIB_H -#include -#endif - -#ifdef __GLIBC__ -typedef __locale_t xsltLocale; -#else -typedef locale_t xsltLocale; -#endif -#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 2 -#define newlocale __newlocale -#define freelocale __freelocale -#define strxfrm_l __strxfrm_l -#define LC_COLLATE_MASK (1 << LC_COLLATE) -#endif - -int -main () -{ - - xsltLocale locale; - const char *src[2] = { "\xc3\x84rger", "Zeppelin" }; - char *dst[2]; - size_t len, r; - int i; - - locale = newlocale(LC_COLLATE_MASK, "en_US.utf8", NULL); - if (locale == NULL) exit(1); - for (i=0; i<2; ++i) { - len = strxfrm_l(NULL, src[i], 0, locale) + 1; - dst[i] = malloc(len); - if(dst[i] == NULL) exit(1); - r = strxfrm_l(dst[i], src[i], len, locale); - if(r >= len) exit(1); - } - if (strcmp(dst[0], dst[1]) >= 0) exit(1); - - exit(0); - return(0); - - ; - return 0; -} +for ac_func in strxfrm_l +do : + ac_fn_c_check_func "$LINENO" "strxfrm_l" "ac_cv_func_strxfrm_l" +if test "x$ac_cv_func_strxfrm_l" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STRXFRM_L 1 _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; XSLT_LOCALE_XLOCALE=1 -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -else - case "$host" in - *-*-mingw*) - { $as_echo "$as_me:${as_lineno-$LINENO}: using winapi locale" >&5 -$as_echo "$as_me: using winapi locale" >&6;} - XSLT_LOCALE_WINAPI=1;; - esac -fi - - +done @@ -15516,7 +15442,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libxslt $as_me 1.1.31, which was +This file was extended by libxslt $as_me 1.1.32, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15582,7 +15508,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libxslt config.status 1.1.31 +libxslt config.status 1.1.32 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 59e9e69a..9f40d9aa 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.63) m4_define([MAJOR_VERSION], [1]) m4_define([MINOR_VERSION], [1]) -m4_define([MICRO_VERSION], [31]) +m4_define([MICRO_VERSION], [32]) AC_INIT([libxslt], [MAJOR_VERSION.MINOR_VERSION.MICRO_VERSION]) AC_CONFIG_SRCDIR([libxslt/xslt.c]) @@ -20,7 +20,7 @@ LIBXSLT_MINOR_VERSION=MINOR_VERSION LIBXSLT_MICRO_VERSION=MICRO_VERSION LIBEXSLT_MAJOR_VERSION=0 LIBEXSLT_MINOR_VERSION=8 -LIBEXSLT_MICRO_VERSION=19 +LIBEXSLT_MICRO_VERSION=20 LIBXML_REQUIRED_VERSION=2.6.27 @@ -161,74 +161,8 @@ dnl dnl Detect supported locale dnl -XSLT_LOCALE_XLOCALE=0 -XSLT_LOCALE_WINAPI=0 - AC_CHECK_HEADERS([locale.h xlocale.h]) -if test $ac_cv_header_xlocale_h = yes; then -dnl -dnl Check for generic locale_t declaration -dnl -AC_MSG_CHECKING([if xlocale program link]) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -#ifdef HAVE_LOCALE_H -#include -#endif -#ifdef HAVE_XLOCALE_H -#include -#endif -#ifdef HAVE_STRING_H -#include -#endif -#ifdef HAVE_STDLIB_H -#include -#endif - -#ifdef __GLIBC__ -typedef __locale_t xsltLocale; -#else -typedef locale_t xsltLocale; -#endif -#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 2 -#define newlocale __newlocale -#define freelocale __freelocale -#define strxfrm_l __strxfrm_l -#define LC_COLLATE_MASK (1 << LC_COLLATE) -#endif -]],[[ - xsltLocale locale; - const char *src[2] = { "\xc3\x84rger", "Zeppelin" }; - char *dst[2]; - size_t len, r; - int i; - - locale = newlocale(LC_COLLATE_MASK, "en_US.utf8", NULL); - if (locale == NULL) exit(1); - for (i=0; i<2; ++i) { - len = strxfrm_l(NULL, src[i], 0, locale) + 1; - dst[i] = malloc(len); - if(dst[i] == NULL) exit(1); - r = strxfrm_l(dst[i], src[i], len, locale); - if(r >= len) exit(1); - } - if (strcmp(dst[0], dst[1]) >= 0) exit(1); - - exit(0); - return(0); -]])], - [AC_MSG_RESULT(yes); XSLT_LOCALE_XLOCALE=1], - [AC_MSG_RESULT(no)] -) -else - case "$host" in - *-*-mingw*) - AC_MSG_NOTICE([using winapi locale]) - XSLT_LOCALE_WINAPI=1;; - esac -fi - -AC_SUBST(XSLT_LOCALE_XLOCALE) -AC_SUBST(XSLT_LOCALE_WINAPI) +AC_CHECK_FUNCS([strxfrm_l]) dnl dnl Math detection diff --git a/doc/APIchunk1.html b/doc/APIchunk1.html index acd1a699..d6e975a4 100644 --- a/doc/APIchunk1.html +++ b/doc/APIchunk1.html @@ -52,6 +52,8 @@ A:link, A:visited, A:active { text-decoration: underline } CHECK_STOPPEDE
XML_CAST_FPTR
XSLT_LOCALE_NONE
+XSLT_LOCALE_POSIX
+XSLT_LOCALE_WINAPI
XSLT_RUNTIME_EXTRA
XSLT_RUNTIME_EXTRA_FREE
XSLT_RUNTIME_EXTRA_LST
@@ -99,7 +101,8 @@ A:link, A:visited, A:active { text-decoration: underline } xsltSetGenericErrorFunc
Otherwise
xsltDoSortFunction
Output
_xsltStylesheet
-

Letter P:

Parser
xsltDocumentFunction
+

Letter P:

POSIX
XSLT_LOCALE_POSIX
+
Parser
xsltDocumentFunction
xsltElementAvailableFunction
xsltFormatNumberFunction
xsltFunctionAvailableFunction
diff --git a/doc/APIchunk10.html b/doc/APIchunk10.html index 8452357e..8cc1850a 100644 --- a/doc/APIchunk10.html +++ b/doc/APIchunk10.html @@ -460,9 +460,10 @@ A:link, A:visited, A:active { text-decoration: underline }
suggested
xsltGetSpecialNamespace
suitable
xsltCompilePattern
sun
xsltFormatNumberConversion
-
support
xsltFreeLocales
+
support
XSLT_LOCALE_NONE
+XSLT_LOCALE_WINAPI
+xsltFreeLocales
supported
XSLT_DEFAULT_VERSION
-XSLT_LOCALE_NONE
sure
xsltAllocateExtraCtxt
system
xsltNewLocale
system-property
xsltSystemPropertyFunction
diff --git a/doc/APIchunk11.html b/doc/APIchunk11.html index ed84e3ba..71210eca 100644 --- a/doc/APIchunk11.html +++ b/doc/APIchunk11.html @@ -113,7 +113,8 @@ A:link, A:visited, A:active { text-decoration: underline } xsltGetSpecialNamespace
xsltSetCtxtSortFunc
xsltStrxfrm
-
there
_xsltCompilerCtxt
+
there
XSLT_LOCALE_NONE
+_xsltCompilerCtxt
xsltAllocateExtraCtxt
xsltGetQNameURI
xsltGetQNameURI2
@@ -203,7 +204,9 @@ A:link, A:visited, A:active { text-decoration: underline } xsltGetUTF8Char
xsltSetSecurityPrefs
usage
XSLT_FAST_IF
-
use
xsltAddKey
+
use
XSLT_LOCALE_POSIX
+XSLT_LOCALE_WINAPI
+xsltAddKey
xsltCopyNamespaceList
xsltDocLoaderFunc
xsltEvalGlobalVariables
diff --git a/doc/APIchunk2.html b/doc/APIchunk2.html index e58dacd0..7fd0d2a1 100644 --- a/doc/APIchunk2.html +++ b/doc/APIchunk2.html @@ -131,6 +131,7 @@ A:link, A:visited, A:active { text-decoration: underline }
Will
CHECK_STOPPED
CHECK_STOPPED0
CHECK_STOPPEDE
+
WinAPI
XSLT_LOCALE_WINAPI

Letter X:

XALAN
XSLT_XALAN_NAMESPACE
XInclude
_xsltTransformContext
xsltGetXIncludeDefault
@@ -304,8 +305,7 @@ A:link, A:visited, A:active { text-decoration: underline } xsltSaveResultToFile
xsltSaveResultToFilename
xsltSaveResultToString
-
are
XSLT_LOCALE_NONE
-_xsltDocument
+
are
_xsltDocument
_xsltStackElem
_xsltStylesheet
_xsltTransformContext
diff --git a/doc/APIchunk4.html b/doc/APIchunk4.html index 8d81ac73..ffd923bf 100644 --- a/doc/APIchunk4.html +++ b/doc/APIchunk4.html @@ -304,9 +304,12 @@ A:link, A:visited, A:active { text-decoration: underline }
exsltFuncFunctionFunction
xsltApplyOneTemplate
xsltParseStylesheetCallerParam
extInfos
xsltGetExtInfo
+
extended
XSLT_LOCALE_NONE
+XSLT_LOCALE_WINAPI
extending
xsltInitElemPreComp
extension-element-prefixes
_xsltPrincipalStylesheetData
extensions
XSLT_LIBXSLT_NAMESPACE
+XSLT_LOCALE_POSIX
XSLT_SAXON_NAMESPACE
XSLT_XALAN_NAMESPACE
XSLT_XT_NAMESPACE
diff --git a/doc/APIchunk6.html b/doc/APIchunk6.html index be1c01d3..af3dffc8 100644 --- a/doc/APIchunk6.html +++ b/doc/APIchunk6.html @@ -110,6 +110,8 @@ A:link, A:visited, A:active { text-decoration: underline }
indented
_xsltStylesheet
index
nr
indicating
XSLT_LOCALE_NONE
+XSLT_LOCALE_POSIX
+XSLT_LOCALE_WINAPI
xsltDocLoaderFunc
indicator
xsltEvalStaticAttrValueTemplate
info
_xsltCompilerNodeInfo
diff --git a/doc/APIchunk7.html b/doc/APIchunk7.html index 6a0cf6fa..eb08c29d 100644 --- a/doc/APIchunk7.html +++ b/doc/APIchunk7.html @@ -118,6 +118,8 @@ A:link, A:visited, A:active { text-decoration: underline } xsltParseStylesheetVariable
xsltSplitQName
locale
XSLT_LOCALE_NONE
+XSLT_LOCALE_POSIX
+XSLT_LOCALE_WINAPI
xsltFreeLocale
xsltFreeLocales
xsltLocaleStrcmp
diff --git a/doc/APIfiles.html b/doc/APIfiles.html index 8437489a..fb98dc28 100644 --- a/doc/APIfiles.html +++ b/doc/APIfiles.html @@ -493,6 +493,8 @@ A:link, A:visited, A:active { text-decoration: underline } XSLTPUBVAR
_REENTRANT

Module xsltlocale:

XSLT_LOCALE_NONE
+XSLT_LOCALE_POSIX
+XSLT_LOCALE_WINAPI
xsltFreeLocale
xsltFreeLocales
xsltLocale
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html index 1b7483e8..bfc1e1cd 100644 --- a/doc/APIsymbols.html +++ b/doc/APIsymbols.html @@ -84,6 +84,8 @@ A:link, A:visited, A:active { text-decoration: underline } XSLT_LOAD_START
XSLT_LOAD_STYLESHEET
XSLT_LOCALE_NONE
+XSLT_LOCALE_POSIX
+XSLT_LOCALE_WINAPI
XSLT_MARK_RES_TREE_FRAG
XSLT_MAX_SORT
XSLT_NAMESPACE
diff --git a/doc/Makefile.in b/doc/Makefile.in index 4983091d..9ef3e784 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -273,8 +273,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/doc/html/libxslt-xsltlocale.html b/doc/html/libxslt-xsltlocale.html index 01bb5f23..2f4f775c 100644 --- a/doc/html/libxslt-xsltlocale.html +++ b/doc/html/libxslt-xsltlocale.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } - Module xsltlocale from libxslt
Action against software patentsGNOME2 LogoW3C logoRed Hat Logo
Made with Libxslt Logo

The XSLT C library for GNOME

Module xsltlocale from libxslt

API Menu
Related links
API Indexes
PrevxsltexportsUpAPI documentationHomeHomexsltutilsNext

Interfaces for locale handling. Needed for language dependent sorting.

Table of Contents

#define XSLT_LOCALE_NONE
Typedef void * xsltLocale
+    Module xsltlocale from libxslt
Action against software patentsGNOME2 LogoW3C logoRed Hat Logo
Made with Libxslt Logo
The XSLT C library for GNOME
Module xsltlocale from libxslt
API Menu
Related links
API Indexes
PrevxsltexportsUpAPI documentationHomeHomexsltutilsNext
Interfaces for locale handling. Needed for language dependent sorting. 
Table of Contents
#define XSLT_LOCALE_NONE
#define XSLT_LOCALE_POSIX
#define XSLT_LOCALE_WINAPI
Typedef void * xsltLocale
 
Typedef xmlChar xsltLocaleChar
 
void	xsltFreeLocale			(xsltLocale locale)

 
void	xsltFreeLocales			(void)

@@ -15,7 +15,9 @@ A:link, A:visited, A:active { text-decoration: underline }
 
xsltLocale	xsltNewLocale		(const xmlChar * languageTag)

 
xsltLocaleChar *	xsltStrxfrm	(xsltLocale locale, 
					 const xmlChar * string)

 
Description

-
Macro: XSLT_LOCALE_NONE
#define XSLT_LOCALE_NONE
Macro indicating that locale are not supported

+
Macro: XSLT_LOCALE_NONE
#define XSLT_LOCALE_NONE
Macro indicating that there's no extended locale support

+
Macro: XSLT_LOCALE_POSIX
#define XSLT_LOCALE_POSIX
Macro indicating to use POSIX locale extensions

+
Macro: XSLT_LOCALE_WINAPI
#define XSLT_LOCALE_WINAPI
Macro indicating to use WinAPI for extended locale support

 
Function: xsltFreeLocale
void	xsltFreeLocale			(xsltLocale locale)

 
Frees a locale created with xsltNewLocale

 
locale:the locale to free
Function: xsltFreeLocales
void	xsltFreeLocales			(void)

diff --git a/doc/libxslt-api.xml b/doc/libxslt-api.xml
index a0bcbdfa..ecb40354 100644
--- a/doc/libxslt-api.xml
+++ b/doc/libxslt-api.xml
@@ -579,7 +579,9 @@
      Locale handling
      Interfaces for locale handling. Needed for language dependent sorting. 
      Nick Wellnhofer 
+     
      
+     
      
      
      
@@ -769,7 +771,13 @@
       This is the libxslt namespace for specific extensions.
     
     
-      Macro indicating that locale are not supported
+      Macro indicating that there's no extended locale support
+    
+    
+      Macro indicating to use POSIX locale extensions
+    
+    
+      Macro indicating to use WinAPI for extended locale support
     
     
       internal macro to set up tree fragments
diff --git a/doc/libxslt-refs.xml b/doc/libxslt-refs.xml
index ce0f95f1..ea918a59 100644
--- a/doc/libxslt-refs.xml
+++ b/doc/libxslt-refs.xml
@@ -77,6 +77,8 @@
     
     
     
+    
+    
     
     
     
@@ -665,6 +667,8 @@
       
       
       
+      
+      
       
       
       
@@ -2465,6 +2469,8 @@
     
     
       
+      
+      
       
       
       
@@ -3018,6 +3024,8 @@
           
           
           
+          
+          
           
           
           
@@ -3120,6 +3128,9 @@
         
       
       
+        
+          
+        
         
           
           
@@ -3533,6 +3544,9 @@
           
           
         
+        
+          
+        
       
       
         
@@ -3823,7 +3837,6 @@
           
         
         
-          
           
           
           
@@ -5035,6 +5048,10 @@
         
           
         
+        
+          
+          
+        
         
           
         
@@ -5043,6 +5060,7 @@
         
         
           
+          
           
           
           
@@ -5580,6 +5598,8 @@
         
         
           
+          
+          
           
         
         
@@ -5964,6 +5984,8 @@
         
         
           
+          
+          
           
           
           
@@ -7752,11 +7774,12 @@
           
         
         
+          
+          
           
         
         
           
-          
         
         
           
@@ -7911,6 +7934,7 @@
           
         
         
+          
           
           
           
@@ -8081,6 +8105,8 @@
           
         
         
+          
+          
           
           
           
diff --git a/libexslt/Makefile.in b/libexslt/Makefile.in
index abfe5ee8..81622631 100644
--- a/libexslt/Makefile.in
+++ b/libexslt/Makefile.in
@@ -334,8 +334,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/libexslt/common.c b/libexslt/common.c
index 91be04fd..ff3ab755 100644
--- a/libexslt/common.c
+++ b/libexslt/common.c
@@ -1,7 +1,7 @@
 #define IN_LIBEXSLT
 #include "libexslt/libexslt.h"
 
-#if defined(WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
+#if defined(_WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
 #include 
 #else
 #include "config.h"
diff --git a/libexslt/crypto.c b/libexslt/crypto.c
index e13db8b1..ac390387 100644
--- a/libexslt/crypto.c
+++ b/libexslt/crypto.c
@@ -1,7 +1,7 @@
 #define IN_LIBEXSLT
 #include "libexslt/libexslt.h"
 
-#if defined(WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
+#if defined(_WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
 #include 
 #else
 #include "config.h"
@@ -109,7 +109,7 @@ exsltCryptoHex2Bin (const unsigned char *hex, int hexlen,
     return j;
 }
 
-#if defined(WIN32)
+#if defined(_WIN32) && !defined(__CYGWIN__)
 
 #define HAVE_CRYPTO
 #define PLATFORM_HASH	exsltCryptoCryptoApiHash
@@ -121,12 +121,14 @@ exsltCryptoHex2Bin (const unsigned char *hex, int hexlen,
 
 #include 
 #include 
+#ifdef _MSC_VER
 #pragma comment(lib, "advapi32.lib")
+#endif
 
 static void
 exsltCryptoCryptoApiReportError (xmlXPathParserContextPtr ctxt,
 				 int line) {
-    LPVOID lpMsgBuf;
+    char *lpMsgBuf;
     DWORD dw = GetLastError ();
 
     FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER |
@@ -143,7 +145,7 @@ exsltCryptoCryptoApiReportError (xmlXPathParserContextPtr ctxt,
 static HCRYPTHASH
 exsltCryptoCryptoApiCreateHash (xmlXPathParserContextPtr ctxt,
 				HCRYPTPROV hCryptProv, ALG_ID algorithm,
-				const char *msg, unsigned int msglen,
+				const unsigned char *msg, unsigned int msglen,
 				char *dest, unsigned int destlen)
 {
     HCRYPTHASH hHash = 0;
@@ -154,12 +156,12 @@ exsltCryptoCryptoApiCreateHash (xmlXPathParserContextPtr ctxt,
 	return 0;
     }
 
-    if (!CryptHashData (hHash, (const BYTE *) msg, msglen, 0)) {
+    if (!CryptHashData (hHash, msg, msglen, 0)) {
 	exsltCryptoCryptoApiReportError (ctxt, __LINE__);
 	goto fail;
     }
 
-    if (!CryptGetHashParam (hHash, HP_HASHVAL, dest, &dwHashLen, 0)) {
+    if (!CryptGetHashParam (hHash, HP_HASHVAL, (BYTE *) dest, &dwHashLen, 0)) {
 	exsltCryptoCryptoApiReportError (ctxt, __LINE__);
 	goto fail;
     }
@@ -194,8 +196,8 @@ exsltCryptoCryptoApiHash (xmlXPathParserContextPtr ctxt,
     }
 
     hHash = exsltCryptoCryptoApiCreateHash (ctxt, hCryptProv,
-					    algorithm, msg, msglen,
-					    dest, HASH_DIGEST_LENGTH);
+					    algorithm, (unsigned char *) msg,
+                                            msglen, dest, HASH_DIGEST_LENGTH);
     if (0 != hHash) {
 	CryptDestroyHash (hHash);
     }
@@ -212,7 +214,7 @@ exsltCryptoCryptoApiRc4Encrypt (xmlXPathParserContextPtr ctxt,
     HCRYPTKEY hKey;
     HCRYPTHASH hHash;
     DWORD dwDataLen;
-    unsigned char hash[HASH_DIGEST_LENGTH];
+    char hash[HASH_DIGEST_LENGTH];
 
     if (msglen > destlen) {
 	xsltTransformError (xsltXPathGetTransformContext (ctxt), NULL,
@@ -263,7 +265,7 @@ exsltCryptoCryptoApiRc4Decrypt (xmlXPathParserContextPtr ctxt,
     HCRYPTKEY hKey;
     HCRYPTHASH hHash;
     DWORD dwDataLen;
-    unsigned char hash[HASH_DIGEST_LENGTH];
+    char hash[HASH_DIGEST_LENGTH];
 
     if (msglen > destlen) {
 	xsltTransformError (xsltXPathGetTransformContext (ctxt), NULL,
@@ -305,7 +307,7 @@ exsltCryptoCryptoApiRc4Decrypt (xmlXPathParserContextPtr ctxt,
     CryptReleaseContext (hCryptProv, 0);
 }
 
-#endif /* defined(WIN32) */
+#endif /* defined(_WIN32) */
 
 #if defined(HAVE_GCRYPT)
 
diff --git a/libexslt/date.c b/libexslt/date.c
index 8687802f..4b74677f 100644
--- a/libexslt/date.c
+++ b/libexslt/date.c
@@ -22,7 +22,7 @@
 #define IN_LIBEXSLT
 #include "libexslt/libexslt.h"
 
-#if defined(WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
+#if defined(_WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
 #include 
 #else
 #include "config.h"
@@ -808,8 +808,9 @@ exsltDateCurrent (void)
     gmtime_r(&secs, &gmTm);
 #else
     tb = gmtime(&secs);
-    if (tb != NULL)
-        gmTm = *tb;
+    if (tb == NULL)
+        return NULL;
+    gmTm = *tb;
 #endif
     ret->tz_flag = 0;
 #if 0
diff --git a/libexslt/dynamic.c b/libexslt/dynamic.c
index ed5965e0..dd0804bc 100644
--- a/libexslt/dynamic.c
+++ b/libexslt/dynamic.c
@@ -23,7 +23,7 @@
 #define IN_LIBEXSLT
 #include "libexslt/libexslt.h"
 
-#if defined(WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
+#if defined(_WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
 #include 
 #else
 #include "config.h"
diff --git a/libexslt/functions.c b/libexslt/functions.c
index 3f4e92cf..dc794e3d 100644
--- a/libexslt/functions.c
+++ b/libexslt/functions.c
@@ -1,7 +1,7 @@
 #define IN_LIBEXSLT
 #include "libexslt/libexslt.h"
 
-#if defined(WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
+#if defined(_WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
 #include 
 #else
 #include "config.h"
diff --git a/libexslt/libexslt.h b/libexslt/libexslt.h
index 2dd9b37b..ad9cc748 100644
--- a/libexslt/libexslt.h
+++ b/libexslt/libexslt.h
@@ -9,7 +9,7 @@
 #ifndef __XSLT_LIBEXSLT_H__
 #define __XSLT_LIBEXSLT_H__
 
-#if defined(WIN32) && !defined (__CYGWIN__) && !defined (__MINGW32__)
+#if defined(_WIN32) && !defined (__CYGWIN__) && !defined (__MINGW32__)
 #include 
 #else
 #include "config.h"
diff --git a/libexslt/math.c b/libexslt/math.c
index 6b24dbe0..f1aa0ba5 100644
--- a/libexslt/math.c
+++ b/libexslt/math.c
@@ -1,7 +1,7 @@
 #define IN_LIBEXSLT
 #include "libexslt/libexslt.h"
 
-#if defined(WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
+#if defined(_WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
 #include 
 #else
 #include "config.h"
diff --git a/libexslt/saxon.c b/libexslt/saxon.c
index 7a2f63be..15343969 100644
--- a/libexslt/saxon.c
+++ b/libexslt/saxon.c
@@ -1,7 +1,7 @@
 #define IN_LIBEXSLT
 #include "libexslt/libexslt.h"
 
-#if defined(WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
+#if defined(_WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
 #include 
 #else
 #include "config.h"
diff --git a/libexslt/sets.c b/libexslt/sets.c
index 8bb540d8..c7142ff1 100644
--- a/libexslt/sets.c
+++ b/libexslt/sets.c
@@ -1,7 +1,7 @@
 #define IN_LIBEXSLT
 #include "libexslt/libexslt.h"
 
-#if defined(WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
+#if defined(_WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
 #include 
 #else
 #include "config.h"
diff --git a/libexslt/strings.c b/libexslt/strings.c
index 24889362..14d9172f 100644
--- a/libexslt/strings.c
+++ b/libexslt/strings.c
@@ -1,7 +1,7 @@
 #define IN_LIBEXSLT
 #include "libexslt/libexslt.h"
 
-#if defined(WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
+#if defined(_WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
 #include 
 #else
 #include "config.h"
diff --git a/libxslt.spec b/libxslt.spec
index a20a4ade..392d7fe6 100644
--- a/libxslt.spec
+++ b/libxslt.spec
@@ -1,6 +1,6 @@
 Summary: Library providing the GNOME XSLT engine
 Name: libxslt
-Version: 1.1.31
+Version: 1.1.32
 Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
@@ -129,5 +129,5 @@ rm -fr %{buildroot}
 %doc python/tests/*.xsl
 
 %changelog
-* Fri Oct  6 2017 Daniel Veillard 
-- upstream release 1.1.31 see http://xmlsoft.org/XSLT/news.html
+* Thu Nov  2 2017 Daniel Veillard 
+- upstream release 1.1.32 see http://xmlsoft.org/XSLT/news.html
diff --git a/libxslt/Makefile.in b/libxslt/Makefile.in
index 82969b90..4e193e83 100644
--- a/libxslt/Makefile.in
+++ b/libxslt/Makefile.in
@@ -337,8 +337,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/libxslt/libxslt.h b/libxslt/libxslt.h
index e6d4c831..5e98158e 100644
--- a/libxslt/libxslt.h
+++ b/libxslt/libxslt.h
@@ -10,7 +10,7 @@
 #ifndef __XSLT_LIBXSLT_H__
 #define __XSLT_LIBXSLT_H__
 
-#if defined(WIN32) && !defined (__CYGWIN__) && !defined (__MINGW32__)
+#if defined(_WIN32) && !defined (__CYGWIN__) && !defined (__MINGW32__)
 #include 
 #else
 #include "config.h"
diff --git a/libxslt/security.c b/libxslt/security.c
index 965175f7..9c848cc4 100644
--- a/libxslt/security.c
+++ b/libxslt/security.c
@@ -34,7 +34,7 @@
 #include 
 #endif
 
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__)
 #include 
 #ifndef INVALID_FILE_ATTRIBUTES
 #define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
@@ -279,7 +279,7 @@ xsltCheckFilename (const char *path)
 {
 #ifdef HAVE_STAT
     struct stat stat_buffer;
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__)
     DWORD dwAttrs;
 
     dwAttrs = GetFileAttributes(path);
@@ -384,7 +384,7 @@ xsltCheckWrite(xsltSecurityPrefsPtr sec,
     if ((uri->scheme == NULL) ||
 	(xmlStrEqual(BAD_CAST uri->scheme, BAD_CAST "file"))) {
 
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__)
     if ((uri->path)&&(uri->path[0]=='/')&&
         (uri->path[1]!='\0')&&(uri->path[2]==':'))
     ret = xsltCheckWritePath(sec, ctxt, uri->path+1);
diff --git a/libxslt/transform.c b/libxslt/transform.c
index a9e8ffee..560f43ca 100644
--- a/libxslt/transform.c
+++ b/libxslt/transform.c
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -5872,7 +5873,8 @@ xsltApplyStylesheetInternal(xsltStylesheetPtr style, xmlDocPtr doc,
      */
     root = xmlDocGetRootElement(doc);
     if (root != NULL) {
-	if (((long) root->content) >= 0 && (xslDebugStatus == XSLT_DEBUG_NONE))
+	if (((ptrdiff_t) root->content >= 0) &&
+            (xslDebugStatus == XSLT_DEBUG_NONE))
 	    xmlXPathOrderDocElems(doc);
     }
 
diff --git a/libxslt/xslt.c b/libxslt/xslt.c
index 7d9ddb66..54a39de9 100644
--- a/libxslt/xslt.c
+++ b/libxslt/xslt.c
@@ -42,6 +42,7 @@
 #include "preproc.h"
 #include "extra.h"
 #include "security.h"
+#include "xsltlocale.h"
 
 #ifdef WITH_XSLT_DEBUG
 #define WITH_XSLT_DEBUG_PARSING
diff --git a/libxslt/xsltconfig.h.in b/libxslt/xsltconfig.h.in
index 6e4e3285..5fa5e589 100644
--- a/libxslt/xsltconfig.h.in
+++ b/libxslt/xsltconfig.h.in
@@ -123,19 +123,6 @@ extern "C" {
 #define LIBXSLT_DEFAULT_PLUGINS_PATH() "@LIBXSLT_DEFAULT_PLUGINS_PATH@"
 #endif
 
-/**
- * Locale support
- */
-#if @XSLT_LOCALE_XLOCALE@
-#ifndef XSLT_LOCALE_XLOCALE
-#define XSLT_LOCALE_XLOCALE
-#endif
-#elif @XSLT_LOCALE_WINAPI@
-#ifndef XSLT_LOCALE_WINAPI
-#define XSLT_LOCALE_WINAPI
-#endif
-#endif
-
 /**
  * ATTRIBUTE_UNUSED:
  *
diff --git a/libxslt/xsltlocale.c b/libxslt/xsltlocale.c
index b5fe9863..c69735cd 100644
--- a/libxslt/xsltlocale.c
+++ b/libxslt/xsltlocale.c
@@ -19,13 +19,6 @@
 #include "xsltlocale.h"
 #include "xsltutils.h"
 
-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 2
-#define newlocale __newlocale
-#define freelocale __freelocale
-#define strxfrm_l __strxfrm_l
-#define LC_COLLATE_MASK (1 << LC_COLLATE)
-#endif
-
 #define TOUPPER(c) (c & ~0x20)
 #define TOLOWER(c) (c | 0x20)
 #define ISALPHA(c) ((unsigned)(TOUPPER(c) - 'A') < 26)
@@ -92,7 +85,7 @@ xsltFreeLocales(void) {
  */
 xsltLocale
 xsltNewLocale(const xmlChar *languageTag) {
-#ifdef XSLT_LOCALE_XLOCALE
+#ifdef XSLT_LOCALE_POSIX
     xsltLocale locale;
     char localeName[XSLTMAX_LANGTAGLEN+6]; /* 6 chars for ".utf8\0" */
     const xmlChar *p = languageTag;
@@ -194,7 +187,7 @@ xsltNewLocale(const xmlChar *languageTag) {
     region = xsltDefaultRegion(localeName);
     if (region == NULL) goto end;
 
-    strcpy(localeName + llen + 1, region);
+    strcpy((char *) localeName + llen + 1, (char *) region);
     locale = xslt_locale_WINAPI(localeName);
 end:
     return(locale);
@@ -352,7 +345,7 @@ xsltDefaultRegion(const xmlChar *localeName) {
  */
 void
 xsltFreeLocale(xsltLocale locale) {
-#ifdef XSLT_LOCALE_XLOCALE
+#ifdef XSLT_LOCALE_POSIX
     freelocale(locale);
 #endif
 }
@@ -376,7 +369,7 @@ xsltStrxfrm(xsltLocale locale, const xmlChar *string)
     size_t xstrlen, r;
     xsltLocaleChar *xstr;
 
-#ifdef XSLT_LOCALE_XLOCALE
+#ifdef XSLT_LOCALE_POSIX
     xstrlen = strxfrm_l(NULL, (const char *)string, 0, locale) + 1;
     xstr = (xsltLocaleChar *) xmlMalloc(xstrlen);
     if (xstr == NULL) {
@@ -389,7 +382,7 @@ xsltStrxfrm(xsltLocale locale, const xmlChar *string)
 #endif
 
 #ifdef XSLT_LOCALE_WINAPI
-    xstrlen = MultiByteToWideChar(CP_UTF8, 0, string, -1, NULL, 0);
+    xstrlen = MultiByteToWideChar(CP_UTF8, 0, (char *) string, -1, NULL, 0);
     if (xstrlen == 0) {
         xsltTransformError(NULL, NULL, NULL, "xsltStrxfrm : MultiByteToWideChar check failed\n");
         return(NULL);
@@ -399,7 +392,7 @@ xsltStrxfrm(xsltLocale locale, const xmlChar *string)
         xsltTransformError(NULL, NULL, NULL, "xsltStrxfrm : out of memory\n");
         return(NULL);
     }
-    r = MultiByteToWideChar(CP_UTF8, 0, string, -1, xstr, xstrlen);
+    r = MultiByteToWideChar(CP_UTF8, 0, (char *) string, -1, xstr, xstrlen);
     if (r == 0) {
         xsltTransformError(NULL, NULL, NULL, "xsltStrxfrm : MultiByteToWideChar failed\n");
         xmlFree(xstr);
@@ -486,9 +479,11 @@ xsltIterateSupportedLocales(LPSTR lcid) {
     k = sscanf(lcid, "%lx", (long*)&p->lcid);
     if (k < 1) goto end;
     /*don't count terminating null character*/
-    k = GetLocaleInfoA(p->lcid, LOCALE_SISO639LANGNAME , iso639lang , sizeof(iso639lang ));
+    k = GetLocaleInfoA(p->lcid, LOCALE_SISO639LANGNAME,
+                       (char *) iso639lang, sizeof(iso639lang));
     if (--k < 1) goto end;
-    l = GetLocaleInfoA(p->lcid, LOCALE_SISO3166CTRYNAME, iso3136ctry, sizeof(iso3136ctry));
+    l = GetLocaleInfoA(p->lcid, LOCALE_SISO3166CTRYNAME,
+                       (char *) iso3136ctry, sizeof(iso3136ctry));
     if (--l < 1) goto end;
 
     {  /*fill results*/
diff --git a/libxslt/xsltlocale.h b/libxslt/xsltlocale.h
index 8a9ca152..f3b9d6e0 100644
--- a/libxslt/xsltlocale.h
+++ b/libxslt/xsltlocale.h
@@ -14,20 +14,31 @@
 #include 
 #include "xsltexports.h"
 
-#ifdef XSLT_LOCALE_XLOCALE
+#ifdef HAVE_STRXFRM_L
 
+/*
+ * XSLT_LOCALE_POSIX:
+ * Macro indicating to use POSIX locale extensions
+ */
+#define XSLT_LOCALE_POSIX
+
+#ifdef HAVE_LOCALE_H
 #include 
+#endif
+#ifdef HAVE_XLOCALE_H
 #include 
+#endif
 
-#ifdef __GLIBC__
-/*locale_t is defined only if _GNU_SOURCE is defined*/
-typedef __locale_t xsltLocale;
-#else
 typedef locale_t xsltLocale;
-#endif
 typedef xmlChar xsltLocaleChar;
 
-#elif defined(XSLT_LOCALE_WINAPI)
+#elif defined(_WIN32) && !defined(__CYGWIN__)
+
+/*
+ * XSLT_LOCALE_WINAPI:
+ * Macro indicating to use WinAPI for extended locale support
+ */
+#define XSLT_LOCALE_WINAPI
 
 #include 
 #include 
@@ -39,11 +50,9 @@ typedef wchar_t xsltLocaleChar;
 
 /*
  * XSLT_LOCALE_NONE:
- * Macro indicating that locale are not supported
+ * Macro indicating that there's no extended locale support
  */
-#ifndef XSLT_LOCALE_NONE
 #define XSLT_LOCALE_NONE
-#endif
 
 typedef void *xsltLocale;
 typedef xmlChar xsltLocaleChar;
diff --git a/libxslt/xsltutils.c b/libxslt/xsltutils.c
index 6bd8ed06..41498e04 100644
--- a/libxslt/xsltutils.c
+++ b/libxslt/xsltutils.c
@@ -42,16 +42,9 @@
 #include "imports.h"
 #include "transform.h"
 
-/* gettimeofday on Windows ??? */
-#if defined(WIN32) && !defined(__CYGWIN__)
-#ifdef _MSC_VER
-#include 
-#pragma comment(lib, "ws2_32.lib")
-#define gettimeofday(p1,p2)
-#define HAVE_GETTIMEOFDAY
+#if defined(_WIN32) && !defined(__CYGWIN__)
 #define XSLT_WIN32_PERFORMANCE_COUNTER
-#endif /* _MS_VER */
-#endif /* WIN32 */
+#endif
 
 /************************************************************************
  *									*
@@ -1811,6 +1804,8 @@ static long calibration = -1;
  *
  * Returns the number of milliseconds used by xsltTimestamp()
  */
+#if !defined(XSLT_WIN32_PERFORMANCE_COUNTER) && \
+    (defined(HAVE_CLOCK_GETTIME) || defined(HAVE_GETTIMEOFDAY))
 static long
 xsltCalibrateTimestamps(void) {
     register int i;
@@ -1819,6 +1814,7 @@ xsltCalibrateTimestamps(void) {
 	xsltTimestamp();
     return(xsltTimestamp() / 1000);
 }
+#endif
 
 /**
  * xsltCalibrateAdjust:
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 
+#include 
 
 #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@
diff --git a/tests/Makefile.in b/tests/Makefile.in
index c224cff5..58e2b977 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -302,8 +302,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/tests/REC/Makefile.in b/tests/REC/Makefile.in
index 3f8d5ba9..895d32c9 100644
--- a/tests/REC/Makefile.in
+++ b/tests/REC/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@
diff --git a/tests/REC1/Makefile.in b/tests/REC1/Makefile.in
index cfeb8d7d..f1293e2c 100644
--- a/tests/REC1/Makefile.in
+++ b/tests/REC1/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@
diff --git a/tests/REC2/Makefile.in b/tests/REC2/Makefile.in
index 1c3ab63a..9fb981a3 100644
--- a/tests/REC2/Makefile.in
+++ b/tests/REC2/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@
diff --git a/tests/XSLTMark/Makefile.in b/tests/XSLTMark/Makefile.in
index e74342ce..9e9ebb01 100644
--- a/tests/XSLTMark/Makefile.in
+++ b/tests/XSLTMark/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@
diff --git a/tests/docbook/Makefile.in b/tests/docbook/Makefile.in
index 74119f5b..ec97f9cd 100644
--- a/tests/docbook/Makefile.in
+++ b/tests/docbook/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@
diff --git a/tests/docs/Makefile.in b/tests/docs/Makefile.in
index 046833d0..e809e0fa 100644
--- a/tests/docs/Makefile.in
+++ b/tests/docs/Makefile.in
@@ -246,8 +246,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/tests/documents/Makefile.in b/tests/documents/Makefile.in
index 496d96ec..46a76f26 100644
--- a/tests/documents/Makefile.in
+++ b/tests/documents/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@
diff --git a/tests/exslt/Makefile.in b/tests/exslt/Makefile.in
index 79e11512..9e4e2ebc 100644
--- a/tests/exslt/Makefile.in
+++ b/tests/exslt/Makefile.in
@@ -302,8 +302,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/tests/exslt/common/Makefile.in b/tests/exslt/common/Makefile.in
index 19cc9587..fca17106 100644
--- a/tests/exslt/common/Makefile.in
+++ b/tests/exslt/common/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@
diff --git a/tests/exslt/crypto/Makefile.in b/tests/exslt/crypto/Makefile.in
index 636e2bc6..2fc6b44a 100644
--- a/tests/exslt/crypto/Makefile.in
+++ b/tests/exslt/crypto/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@
diff --git a/tests/exslt/date/Makefile.in b/tests/exslt/date/Makefile.in
index 45be52b2..0ae8fcda 100644
--- a/tests/exslt/date/Makefile.in
+++ b/tests/exslt/date/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@
diff --git a/tests/exslt/dynamic/Makefile.in b/tests/exslt/dynamic/Makefile.in
index 1d3d97b1..f2ef251a 100644
--- a/tests/exslt/dynamic/Makefile.in
+++ b/tests/exslt/dynamic/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@
diff --git a/tests/exslt/functions/Makefile.in b/tests/exslt/functions/Makefile.in
index 7037ae49..e5422ba2 100644
--- a/tests/exslt/functions/Makefile.in
+++ b/tests/exslt/functions/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@
diff --git a/tests/exslt/math/Makefile.in b/tests/exslt/math/Makefile.in
index 1c5f52c2..3b8ec9c2 100644
--- a/tests/exslt/math/Makefile.in
+++ b/tests/exslt/math/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@
diff --git a/tests/exslt/saxon/Makefile.in b/tests/exslt/saxon/Makefile.in
index b5e5a5cf..b1c2407c 100644
--- a/tests/exslt/saxon/Makefile.in
+++ b/tests/exslt/saxon/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@
diff --git a/tests/exslt/sets/Makefile.in b/tests/exslt/sets/Makefile.in
index 51e10718..b4c9f02e 100644
--- a/tests/exslt/sets/Makefile.in
+++ b/tests/exslt/sets/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@
diff --git a/tests/exslt/strings/Makefile.in b/tests/exslt/strings/Makefile.in
index fc53924f..6c3eb785 100644
--- a/tests/exslt/strings/Makefile.in
+++ b/tests/exslt/strings/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@
diff --git a/tests/extensions/Makefile.in b/tests/extensions/Makefile.in
index 1cf62dae..7714f863 100644
--- a/tests/extensions/Makefile.in
+++ b/tests/extensions/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@
diff --git a/tests/general/Makefile.am b/tests/general/Makefile.am
index 467b0507..8a56b7f5 100644
--- a/tests/general/Makefile.am
+++ b/tests/general/Makefile.am
@@ -219,7 +219,7 @@ test tests: $(top_builddir)/xsltproc/xsltproc
 	  name=`basename $$j .xsl`; \
 	  out=$(srcdir)/"$$name".out; \
 	  err=$(srcdir)/"$$name".err; \
-	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc $$j $$i \
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --maxdepth 200 $$j $$i \
 	  	> result.$$name 2>err.$$name; \
 	  if [ ! -f $$out ] ; then \
 	  	cp result.$$name $$out ; \
@@ -251,7 +251,7 @@ test tests: $(top_builddir)/xsltproc/xsltproc
 	  name=`basename $$j .xsl`; \
 	  out=$(srcdir)/"$$name".out; \
 	  err=$(srcdir)/"$$name".err; \
-	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nodict $$j $$i \
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nodict --maxdepth 200 $$j $$i \
 	  	> result.$$name 2>err.$$name; \
 	  if [ ! -f $$out ] ; then \
 	  	cp result.$$name $$out ; \
diff --git a/tests/general/Makefile.in b/tests/general/Makefile.in
index cb226ad1..c7f97f2e 100644
--- a/tests/general/Makefile.in
+++ b/tests/general/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@
@@ -708,7 +706,7 @@ test tests: $(top_builddir)/xsltproc/xsltproc
 	  name=`basename $$j .xsl`; \
 	  out=$(srcdir)/"$$name".out; \
 	  err=$(srcdir)/"$$name".err; \
-	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc $$j $$i \
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --maxdepth 200 $$j $$i \
 	  	> result.$$name 2>err.$$name; \
 	  if [ ! -f $$out ] ; then \
 	  	cp result.$$name $$out ; \
@@ -740,7 +738,7 @@ test tests: $(top_builddir)/xsltproc/xsltproc
 	  name=`basename $$j .xsl`; \
 	  out=$(srcdir)/"$$name".out; \
 	  err=$(srcdir)/"$$name".err; \
-	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nodict $$j $$i \
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nodict --maxdepth 200 $$j $$i \
 	  	> result.$$name 2>err.$$name; \
 	  if [ ! -f $$out ] ; then \
 	  	cp result.$$name $$out ; \
diff --git a/tests/keys/Makefile.in b/tests/keys/Makefile.in
index 2b468f0a..52be75f8 100644
--- a/tests/keys/Makefile.in
+++ b/tests/keys/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@
diff --git a/tests/multiple/Makefile.in b/tests/multiple/Makefile.in
index 905f0122..a8aee803 100644
--- a/tests/multiple/Makefile.in
+++ b/tests/multiple/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@
diff --git a/tests/namespaces/Makefile.in b/tests/namespaces/Makefile.in
index ecceb54c..e74bd2e6 100644
--- a/tests/namespaces/Makefile.in
+++ b/tests/namespaces/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@
diff --git a/tests/numbers/Makefile.in b/tests/numbers/Makefile.in
index 634b2905..ead2bfbf 100644
--- a/tests/numbers/Makefile.in
+++ b/tests/numbers/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@
diff --git a/tests/plugins/Makefile.in b/tests/plugins/Makefile.in
index b8195a3f..fab25580 100644
--- a/tests/plugins/Makefile.in
+++ b/tests/plugins/Makefile.in
@@ -301,8 +301,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/tests/reports/Makefile.in b/tests/reports/Makefile.in
index 85c83036..dcd0efc0 100644
--- a/tests/reports/Makefile.in
+++ b/tests/reports/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@
diff --git a/tests/xinclude/Makefile.in b/tests/xinclude/Makefile.in
index b28b8b34..e5a94993 100644
--- a/tests/xinclude/Makefile.in
+++ b/tests/xinclude/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@
diff --git a/tests/xmlspec/Makefile.in b/tests/xmlspec/Makefile.in
index 1e65c39b..f78ef95b 100644
--- a/tests/xmlspec/Makefile.in
+++ b/tests/xmlspec/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@
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
index 23a02d27..a6d57a12 100644
--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
@@ -51,7 +51,7 @@ CPPFLAGS = /nologo
 
 # The compiler and its options.
 CC = cl.exe
-CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /W3 $(CRUNTIME) /D "_REENTRANT"
+CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /W3 /wd4244 /wd4267 $(CRUNTIME) /D "_REENTRANT"
 CFLAGS = $(CFLAGS) /I$(BASEDIR) /I$(XSLT_SRCDIR) /I$(INCPREFIX)
 CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
 
diff --git a/win32/configure.js b/win32/configure.js
index a8098132..56694cce 100644
--- a/win32/configure.js
+++ b/win32/configure.js
@@ -47,7 +47,6 @@ var withIconv = true;
 var withZlib = false;
 var withCrypto = true;
 var withModules = false;
-var withLocale = true;
 /* Win32 build options. */
 var dirSep = "\\";
 var compiler = "msvc";
@@ -107,7 +106,6 @@ function usage()
 	txt += "  zlib:       Use zlib library (" + (withZlib? "yes" : "no") + ")\n";
 	txt += "  crypto:     Enable Crypto support (" + (withCrypto? "yes" : "no") + ")\n";
 	txt += "  modules:    Enable Module support (" + (withModules? "yes" : "no") + ")\n";
-	txt += "  locale:     Enable Locale support, requires unicode OS support (" + (withLocale? "yes" : "no") + ")\n";
 	txt += "\nWin32 build options, default value given in parentheses:\n\n";
 	txt += "  compiler:   Compiler to be used [msvc|mingw] (" + compiler + ")\n";
 	txt += "  cruntime:   C-runtime compiler option (only msvc) (" + cruntime + ")\n";
@@ -242,10 +240,6 @@ function configureXslt()
 			of.WriteLine(s.replace(/\@WITH_DEBUGGER\@/, withDebugger? "1" : "0"));
 		} else if (s.search(/\@WITH_MODULES\@/) != -1) {
 			of.WriteLine(s.replace(/\@WITH_MODULES\@/, withModules? "1" : "0"));
-		} else if (s.search(/\@XSLT_LOCALE_XLOCALE\@/) != -1) {
-			of.WriteLine(s.replace(/\@XSLT_LOCALE_XLOCALE\@/, "0"));
-		} else if (s.search(/\@XSLT_LOCALE_WINAPI\@/) != -1) {
-			of.WriteLine(s.replace(/\@XSLT_LOCALE_WINAPI\@/, withLocale? "1" : "0"));
 		} else if (s.search(/\@LIBXSLT_DEFAULT_PLUGINS_PATH\@/) != -1) {
 			of.WriteLine(s.replace(/\@LIBXSLT_DEFAULT_PLUGINS_PATH\@/, "NULL"));
 		} else
@@ -349,8 +343,6 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) {
 			withCrypto = strToBool(arg.substring(opt.length + 1, arg.length));
 		else if (opt == "modules")
 			withModules = strToBool(arg.substring(opt.length + 1, arg.length));
-		else if (opt == "locale")
-			withLocale = strToBool(arg.substring(opt.length + 1, arg.length));
 		else if (opt == "compiler")
 			compiler = arg.substring(opt.length + 1, arg.length);
  		else if (opt == "cruntime")
@@ -485,7 +477,6 @@ txtOut += "         Use iconv: " + boolToStr(withIconv) + "\n";
 txtOut += "         With zlib: " + boolToStr(withZlib) + "\n";
 txtOut += "            Crypto: " + boolToStr(withCrypto) + "\n";
 txtOut += "           Modules: " + boolToStr(withModules) + "\n";
-txtOut += "            Locale: " + boolToStr(withLocale) + "\n";
 txtOut += "\n";
 txtOut += "Win32 build configuration\n";
 txtOut += "-------------------------\n";
diff --git a/win32/libxslt.def.src b/win32/libxslt.def.src
index 653d3a17..fe7e767c 100644
--- a/win32/libxslt.def.src
+++ b/win32/libxslt.def.src
@@ -58,6 +58,7 @@ xsltDebugDumpExtensions
 xsltDebugGetDefaultTrace
 xsltDebugSetDefaultTrace
 xsltDecimalFormatGetByName
+xsltDecimalFormatGetByQName
 xsltDefaultSortFunction
 xsltDoSortFunction
 xsltDocumentComp
@@ -86,6 +87,7 @@ xsltExtensionInstructionResultRegister
 xsltFindDocument
 xsltFindElemSpaceHandling
 xsltFindTemplate
+xsltFlagRVTs
 xsltForEach
 xsltFormatNumberConversion
 xsltFormatNumberFunction
diff --git a/win32/libxslt/libxslt_so.dsp b/win32/libxslt/libxslt_so.dsp
index 6cbd578b..4bc6cad1 100644
--- a/win32/libxslt/libxslt_so.dsp
+++ b/win32/libxslt/libxslt_so.dsp
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXSLT_SO_EXPORTS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\gnome-xml" /I "..\..\..\gnome-xml\include" /I "..\.." /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXSLT_SO_EXPORTS" /D "WIN32" /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXSLT_SO_EXPORTS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\gnome-xml" /I "..\..\..\gnome-xml\include" /I "..\.." /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXSLT_SO_EXPORTS" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -68,8 +68,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXSLT_SO_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\gnome-xml\include" /I "..\..\..\gnome-xml" /I "..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXSLT_SO_EXPORTS" /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXSLT_SO_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\gnome-xml\include" /I "..\..\..\gnome-xml" /I "..\.." /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXSLT_SO_EXPORTS" /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/libxslt/xsltproc.dsp b/win32/libxslt/xsltproc.dsp
index 5413732b..92938412 100644
--- a/win32/libxslt/xsltproc.dsp
+++ b/win32/libxslt/xsltproc.dsp
@@ -41,8 +41,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\gnome-xml\include" /I "..\..\..\gnome-xml" /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\gnome-xml\include" /I "..\..\..\gnome-xml" /I "..\.." /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -65,8 +65,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\gnome-xml\include" /I "..\..\..\gnome-xml" /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\gnome-xml\include" /I "..\..\..\gnome-xml" /I "..\.." /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/win32/runtests.py b/win32/runtests.py
index 4d9aabb7..f20c946d 100644
--- a/win32/runtests.py
+++ b/win32/runtests.py
@@ -26,7 +26,7 @@ def runtests(xsl_dir, xml_dir="."):
         if not path.isfile(xml_path):
             continue
 
-        args = [ xsltproc, xsl_path, xml_path ]
+        args = [ xsltproc, "--maxdepth", "200", xsl_path, xml_path ]
         p = Popen(args, stdout=PIPE, stderr=PIPE)
         out_path = path.join(xml_dir, name + ".out")
         err_path = path.join(xml_dir, name + ".err")
diff --git a/xsltproc/Makefile.in b/xsltproc/Makefile.in
index 06cb4714..bd5caf9c 100644
--- a/xsltproc/Makefile.in
+++ b/xsltproc/Makefile.in
@@ -307,8 +307,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/xsltproc/testThreads.c b/xsltproc/testThreads.c
index 05f0039c..7c226446 100644
--- a/xsltproc/testThreads.c
+++ b/xsltproc/testThreads.c
@@ -16,7 +16,9 @@
 #include 
 #include 
 
+#ifndef _REENTRANT
 #define _REENTRANT
+#endif
 #include 
 
 #if defined(LIBXML_THREAD_ENABLED) && defined(HAVE_PTHREAD_H)
diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c
index 3c83abda..d8d26698 100644
--- a/xsltproc/xsltproc.c
+++ b/xsltproc/xsltproc.c
@@ -31,6 +31,9 @@
 #ifdef HAVE_STDARG_H
 #include 
 #endif
+#if defined(_WIN32) && !defined(__CYGWIN__)
+#include 
+#endif
 #include 
 #include 
 #include 
@@ -54,18 +57,11 @@
 
 #include 
 
-#if defined(WIN32) && !defined (__CYGWIN__)
-#if defined(_MSC_VER) || defined(__MINGW32__)
-#include 
-#define gettimeofday(p1,p2)
-#endif /* _MS_VER */
-#else /* WIN32 */
 #if defined(HAVE_SYS_TIME_H)
 #include 
 #elif defined(HAVE_TIME_H)
 #include 
 #endif
-#endif /* WIN32 */
 
 #ifdef HAVE_SYS_TIMEB_H
 #include 
@@ -564,6 +560,10 @@ main(int argc, char **argv)
     srand(time(NULL));
     xmlInitMemory();
 
+#if defined(_WIN32) && !defined(__CYGINW__)
+    setmode(fileno(stdout), O_BINARY);
+    setmode(fileno(stderr), O_BINARY);
+#endif
 #if defined(_MSC_VER) && _MSC_VER < 1900
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
@@ -594,8 +594,8 @@ main(int argc, char **argv)
                    (!strcmp(argv[i], "-output")) ||
                    (!strcmp(argv[i], "--output"))) {
             i++;
-#if defined(WIN32) || defined (__CYGWIN__)
-	    output = xmlCanonicPath(argv[i]);
+#if defined(_WIN32) || defined (__CYGWIN__)
+	    output = (char *) xmlCanonicPath((xmlChar *) argv[i]);
             if (output == NULL)
 #endif
 		output = (char *) xmlStrdup((xmlChar *) argv[i]);
-- 
cgit v1.2.3