enhanced previous fix to bug #120684, using excellent suggestion by Daniel

* transform.c: enhanced previous fix to bug #120684, using
  excellent suggestion by Daniel
* attributes.c: fixed bug #119583, merging attribute sets
  from imported stylesheets.
* tests/docs/Makefile.am tests/docs/bug-131.xml
  tests/general/Makefile.am tests/docs/bug-131*: added tests
  to the regression suite for bug #120684.

diff --git a/libxslt/xsltwin32config.h b/libxslt/xsltwin32config.h
index 8c0dac8..0b70288 100644 (file)
--- a/libxslt/xsltwin32config.h
+++ b/libxslt/xsltwin32config.h
@@ -1,13 +1,16 @@
 /*
- * xsltconfig.h: compile-time version informations for the XSLT engine
+ * xsltwin32config.h: compile-time version informations for the XSLT engine
+ *                    when compiled on windows
  *
  * See Copyright for the status of this software.
  *
  * daniel@veillard.com
  */
 
-#ifndef __XML_XSLTCONFIG_H__
-#define __XML_XSLTCONFIG_H__
+#ifndef __XML_XSLTWIN32CONFIG_H__
+#define __XML_XSLTWIN32CONFIG_H__
+
+#include "win32config.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -39,7 +42,7 @@ extern "C" {
  *
  * Activate the compilation of the debug reporting. Speed penalty
  * is insignifiant and being able to run xsltpoc -v is useful. On
- * by default unless --without-debug is passed to configure
+ * by default
  */
 #if 1
 #define WITH_XSLT_DEBUG
@@ -66,66 +69,16 @@ extern "C" {
 #endif
 
 /**
- * XSLT_NEED_TRIO:
- *
- * should be activated in the existing libc library lacks some of the
- * string formatting function, in that case reuse the Trio ones already
- * compiled in the libxml2 library.
- */
-
-#if 0
-#define XSLT_NEED_TRIO
-#endif
-#ifdef __VMS
-#ifndef XSLT_NEED_TRIO
-#define XSLT_NEED_TRIO
-#endif
-#endif
-
-/**
- * WITH_XSLT_DEBUGGER:
- *
- * Activate the compilation of the debugger support. Speed penalty
- * is insignifiant.
- * On by default unless --without-debugger is passed to configure
- */
-#if 1
-#ifndef WITH_DEBUGGER
-#define WITH_DEBUGGER
-#endif
-#endif
-
-/**
  * ATTRIBUTE_UNUSED:
  *
- * This macro is used to flag unused function parameters to GCC
+ * This macro is used to flag unused function parameters to GCC, useless here
  */
-#ifdef __GNUC__
-#ifdef HAVE_ANSIDECL_H
-#include <ansidecl.h>
-#endif
 #ifndef ATTRIBUTE_UNUSED
 #define ATTRIBUTE_UNUSED
 #endif
-#else
-#define ATTRIBUTE_UNUSED
-#endif
-
-/**
- * LIBXSLT_PUBLIC:
- *
- * This macro is used to declare PUBLIC variables for Cygwin and for MSC on Windows
- */
-#if !defined LIBXSLT_PUBLIC
-#if (defined(__CYGWIN__) || defined _MSC_VER) && !defined IN_LIBXSLT && !defined LIBXSLT_STATIC
-#define LIBXSLT_PUBLIC __declspec(dllimport)
-#else
-#define LIBXSLT_PUBLIC
-#endif
-#endif
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __XML_XSLTCONFIG_H__ */
+#endif /* __XML_XSLTWIN32CONFIG_H__ */