mirror of
https://github.com/reactos/reactos.git
synced 2025-08-13 15:15:51 +00:00
[LIBXSLT] Update to version 1.1.36. CORE-17766
This version was released after libxml2 2.10.0, but it removes usage of some now-deprecated functions that would break the build.
This commit is contained in:
Thomas Faber
parent
a620c6f82e
commit
21ab4d93c7
20 changed files with 136 additions and 8171 deletions
|
|
@ -10,7 +10,7 @@
|
|||
#ifndef __XSLT_LIBXSLT_H__
|
||||
#define __XSLT_LIBXSLT_H__
|
||||
|
||||
#if defined(_WIN32) && !defined (__CYGWIN__) && !defined (__MINGW32__)
|
||||
#if defined(_WIN32) && !defined (__MINGW32__)
|
||||
#include <win32config.h>
|
||||
#else
|
||||
#include "config.h"
|
||||
|
|
|
|||
|
|
@ -20,26 +20,26 @@ extern "C" {
|
|||
*
|
||||
* the version string like "1.2.3"
|
||||
*/
|
||||
#define LIBXSLT_DOTTED_VERSION "1.1.35"
|
||||
#define LIBXSLT_DOTTED_VERSION "1.1.36"
|
||||
|
||||
/**
|
||||
* LIBXSLT_VERSION:
|
||||
*
|
||||
* the version number: 1.2.3 value is 10203
|
||||
*/
|
||||
#define LIBXSLT_VERSION 10135
|
||||
#define LIBXSLT_VERSION 10136
|
||||
|
||||
/**
|
||||
* LIBXSLT_VERSION_STRING:
|
||||
*
|
||||
* the version number string, 1.2.3 value is "10203"
|
||||
*/
|
||||
#define LIBXSLT_VERSION_STRING "10135"
|
||||
#define LIBXSLT_VERSION_STRING "10136"
|
||||
|
||||
/**
|
||||
* LIBXSLT_VERSION_EXTRA:
|
||||
*
|
||||
* extra version information, used to show a CVS compilation
|
||||
* extra version information, used to show a Git commit description
|
||||
*/
|
||||
#define LIBXSLT_VERSION_EXTRA ""
|
||||
|
||||
|
|
@ -86,7 +86,6 @@ extern "C" {
|
|||
#define XSLT_NEED_TRIO
|
||||
#endif
|
||||
#ifdef __VMS
|
||||
#define HAVE_MATH_H 1
|
||||
#define HAVE_SYS_STAT_H 1
|
||||
#ifndef XSLT_NEED_TRIO
|
||||
#define XSLT_NEED_TRIO
|
||||
|
|
|
|||
|
|
@ -3,138 +3,56 @@
|
|||
* Description: macros for marking symbols as exportable/importable.
|
||||
*
|
||||
* Copy: See Copyright for the status of this software.
|
||||
*
|
||||
* Author: Igor Zlatkovic <igor@zlatkovic.com>
|
||||
*/
|
||||
|
||||
#ifndef __XSLT_EXPORTS_H__
|
||||
#define __XSLT_EXPORTS_H__
|
||||
|
||||
/**
|
||||
* XSLTPUBFUN:
|
||||
* XSLTPUBFUN, XSLTPUBVAR, XSLTCALL
|
||||
*
|
||||
* Macros which declare an exportable function, an exportable variable and
|
||||
* the calling convention used for functions.
|
||||
*
|
||||
* Please use an extra block for every platform/compiler combination when
|
||||
* modifying this, rather than overlong #ifdef lines. This helps
|
||||
* readability as well as the fact that different compilers on the same
|
||||
* platform might need different definitions.
|
||||
*/
|
||||
#if defined(_WIN32) || defined(__CYGWIN__)
|
||||
/** DOC_DISABLE */
|
||||
|
||||
#ifdef LIBXSLT_STATIC
|
||||
#define XSLTPUBLIC
|
||||
#elif defined(IN_LIBXSLT)
|
||||
#define XSLTPUBLIC __declspec(dllexport)
|
||||
#else
|
||||
#define XSLTPUBLIC __declspec(dllimport)
|
||||
#endif
|
||||
|
||||
#define XSLTCALL __cdecl
|
||||
|
||||
/** DOC_ENABLE */
|
||||
#else /* not Windows */
|
||||
|
||||
/**
|
||||
* XSLTPUBFUN:
|
||||
* XSLTPUBLIC:
|
||||
*
|
||||
* Macros which declare an exportable function
|
||||
* Macro which declares a public symbol
|
||||
*/
|
||||
#define XSLTPUBFUN
|
||||
/**
|
||||
* XSLTPUBVAR:
|
||||
*
|
||||
* Macros which declare an exportable variable
|
||||
*/
|
||||
#define XSLTPUBVAR extern
|
||||
#define XSLTPUBLIC
|
||||
|
||||
/**
|
||||
* XSLTCALL:
|
||||
*
|
||||
* Macros which declare the called convention for exported functions
|
||||
* Macro which declares the calling convention for exported functions
|
||||
*/
|
||||
#define XSLTCALL
|
||||
|
||||
/** DOC_DISABLE */
|
||||
#endif /* platform switch */
|
||||
|
||||
/* Windows platform with MS compiler */
|
||||
#if defined(_WIN32) && defined(_MSC_VER)
|
||||
#undef XSLTPUBFUN
|
||||
#undef XSLTPUBVAR
|
||||
#undef XSLTCALL
|
||||
#if defined(IN_LIBXSLT) && !defined(LIBXSLT_STATIC)
|
||||
#define XSLTPUBFUN __declspec(dllexport)
|
||||
#if defined(__REACTOS__) && defined(__clang__)
|
||||
#define XSLTPUBVAR __declspec(dllexport) extern
|
||||
#else
|
||||
#define XSLTPUBVAR __declspec(dllexport)
|
||||
#endif /* __REACTOS__ && __clang__ */
|
||||
#else
|
||||
#define XSLTPUBFUN
|
||||
#if !defined(LIBXSLT_STATIC)
|
||||
#define XSLTPUBVAR __declspec(dllimport) extern
|
||||
#else
|
||||
#define XSLTPUBVAR extern
|
||||
#endif
|
||||
#endif
|
||||
#define XSLTCALL __cdecl
|
||||
#if !defined _REENTRANT
|
||||
#define _REENTRANT
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* Windows platform with Borland compiler */
|
||||
#if defined(_WIN32) && defined(__BORLANDC__)
|
||||
#undef XSLTPUBFUN
|
||||
#undef XSLTPUBVAR
|
||||
#undef XSLTCALL
|
||||
#if defined(IN_LIBXSLT) && !defined(LIBXSLT_STATIC)
|
||||
#define XSLTPUBFUN __declspec(dllexport)
|
||||
#define XSLTPUBVAR __declspec(dllexport) extern
|
||||
#else
|
||||
#define XSLTPUBFUN
|
||||
#if !defined(LIBXSLT_STATIC)
|
||||
#define XSLTPUBVAR __declspec(dllimport) extern
|
||||
#else
|
||||
#define XSLTPUBVAR extern
|
||||
#endif
|
||||
#endif
|
||||
#define XSLTCALL __cdecl
|
||||
#if !defined _REENTRANT
|
||||
#define _REENTRANT
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* Windows platform with GNU compiler (Mingw) */
|
||||
#if defined(_WIN32) && defined(__MINGW32__)
|
||||
#undef XSLTPUBFUN
|
||||
#undef XSLTPUBVAR
|
||||
#undef XSLTCALL
|
||||
/*
|
||||
#if defined(IN_LIBXSLT) && !defined(LIBXSLT_STATIC)
|
||||
*/
|
||||
#if !defined(LIBXSLT_STATIC)
|
||||
#define XSLTPUBFUN __declspec(dllexport)
|
||||
#define XSLTPUBVAR __declspec(dllexport) extern
|
||||
#else
|
||||
#define XSLTPUBFUN
|
||||
#if !defined(LIBXSLT_STATIC)
|
||||
#define XSLTPUBVAR __declspec(dllimport) extern
|
||||
#else
|
||||
#define XSLTPUBVAR extern
|
||||
#endif
|
||||
#endif
|
||||
#define XSLTCALL __cdecl
|
||||
#if !defined _REENTRANT
|
||||
#define _REENTRANT
|
||||
#endif
|
||||
#endif
|
||||
* XSLTPUBFUN:
|
||||
*
|
||||
* Macro which declares an exportable function
|
||||
*/
|
||||
#define XSLTPUBFUN XSLTPUBLIC
|
||||
|
||||
/* Cygwin platform (does not define _WIN32), GNU compiler */
|
||||
#if defined(__CYGWIN__)
|
||||
#undef XSLTPUBFUN
|
||||
#undef XSLTPUBVAR
|
||||
#undef XSLTCALL
|
||||
#if defined(IN_LIBXSLT) && !defined(LIBXSLT_STATIC)
|
||||
#define XSLTPUBFUN __declspec(dllexport)
|
||||
#define XSLTPUBVAR __declspec(dllexport)
|
||||
#else
|
||||
#define XSLTPUBFUN
|
||||
#if !defined(LIBXSLT_STATIC)
|
||||
#define XSLTPUBVAR __declspec(dllimport) extern
|
||||
#else
|
||||
#define XSLTPUBVAR extern
|
||||
#endif
|
||||
#endif
|
||||
#define XSLTCALL __cdecl
|
||||
#endif
|
||||
/**
|
||||
* XSLTPUBVAR:
|
||||
*
|
||||
* Macro which declares an exportable variable
|
||||
*/
|
||||
#define XSLTPUBVAR XSLTPUBLIC extern
|
||||
|
||||
/* Compatibility */
|
||||
#if !defined(LIBXSLT_PUBLIC)
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
typedef locale_t xsltLocale;
|
||||
typedef xmlChar xsltLocaleChar;
|
||||
|
||||
#elif defined(_WIN32) && !defined(__CYGWIN__)
|
||||
#elif defined(_WIN32)
|
||||
|
||||
/*
|
||||
* XSLT_LOCALE_WINAPI:
|
||||
|
|
|
|||
|
|
@ -13,9 +13,6 @@
|
|||
#define __XML_XSLTUTILS_H__
|
||||
|
||||
#include <libxslt/xsltconfig.h>
|
||||
#ifdef HAVE_STDARG_H
|
||||
#include <stdarg.h>
|
||||
#endif
|
||||
#include <libxml/xpath.h>
|
||||
#include <libxml/dict.h>
|
||||
#include <libxml/xmlerror.h>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue