19 Oct
2009
19 Oct
'09
7:28 p.m.
Author: cwittich
Date: Mon Oct 19 21:28:32 2009
New Revision: 43622
URL: http://svn.reactos.org/svn/reactos?rev=43622&view=rev
Log:
update libxslt headers as well
Added:
trunk/reactos/include/reactos/libs/libxslt/xsltlocale.h (with props)
Modified:
trunk/reactos/include/reactos/libs/libxslt/extensions.h
trunk/reactos/include/reactos/libs/libxslt/libxslt.h
trunk/reactos/include/reactos/libs/libxslt/xsltconfig.h
Modified: trunk/reactos/include/reactos/libs/libxslt/extensions.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxs…
==============================================================================
--- trunk/reactos/include/reactos/libs/libxslt/extensions.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/libs/libxslt/extensions.h [iso-8859-1] Mon Oct 19
21:28:32 2009
@@ -22,6 +22,16 @@
/**
* Extension Modules API.
*/
+
+/**
+ * xsltInitGlobals:
+ *
+ * Initialize the global variables for extensions
+ *
+ */
+
+XSLTPUBFUN void XSLTCALL
+ xsltInitGlobals (void);
/**
* xsltStyleExtInitFunction:
@@ -86,11 +96,11 @@
XSLTPUBFUN int XSLTCALL
xsltUnregisterExtModule (const xmlChar * URI);
-XSLTPUBFUN void * XSLTCALL
+XSLTPUBFUN void * XSLTCALL
xsltGetExtData (xsltTransformContextPtr ctxt,
const xmlChar *URI);
-XSLTPUBFUN void * XSLTCALL
+XSLTPUBFUN void * XSLTCALL
xsltStyleGetExtData (xsltStylesheetPtr style,
const xmlChar *URI);
#ifdef XSLT_REFACTORED
@@ -99,33 +109,29 @@
xsltStylesheetPtr style,
const xmlChar * URI);
#endif
-XSLTPUBFUN void XSLTCALL
- xsltShutdownCtxtExts (xsltTransformContextPtr ctxt);
-
-XSLTPUBFUN void XSLTCALL
- xsltShutdownExts (xsltStylesheetPtr style);
-
-XSLTPUBFUN xsltTransformContextPtr XSLTCALL
- xsltXPathGetTransformContext
+XSLTPUBFUN void XSLTCALL
+ xsltShutdownCtxtExts (xsltTransformContextPtr ctxt);
+
+XSLTPUBFUN void XSLTCALL
+ xsltShutdownExts (xsltStylesheetPtr style);
+
+XSLTPUBFUN xsltTransformContextPtr XSLTCALL
+ xsltXPathGetTransformContext
(xmlXPathParserContextPtr ctxt);
/*
* extension functions
*/
-XSLTPUBFUN int XSLTCALL
- xsltRegisterExtModuleFunction
+XSLTPUBFUN int XSLTCALL
+ xsltRegisterExtModuleFunction
(const xmlChar *name,
const xmlChar *URI,
xmlXPathFunction function);
XSLTPUBFUN xmlXPathFunction XSLTCALL
- xsltExtFunctionLookup (xsltTransformContextPtr ctxt,
- const xmlChar *name,
- const xmlChar *URI);
-XSLTPUBFUN xmlXPathFunction XSLTCALL
xsltExtModuleFunctionLookup (const xmlChar *name,
const xmlChar *URI);
-XSLTPUBFUN int XSLTCALL
- xsltUnregisterExtModuleFunction
+XSLTPUBFUN int XSLTCALL
+ xsltUnregisterExtModuleFunction
(const xmlChar *name,
const xmlChar *URI);
@@ -133,7 +139,7 @@
* extension elements
*/
typedef xsltElemPreCompPtr (*xsltPreComputeFunction)
- (xsltStylesheetPtr style,
+ (xsltStylesheetPtr style,
xmlNodePtr inst,
xsltTransformFunction function);
@@ -141,33 +147,33 @@
xsltNewElemPreComp (xsltStylesheetPtr style,
xmlNodePtr inst,
xsltTransformFunction function);
-XSLTPUBFUN void XSLTCALL
+XSLTPUBFUN void XSLTCALL
xsltInitElemPreComp (xsltElemPreCompPtr comp,
xsltStylesheetPtr style,
xmlNodePtr inst,
xsltTransformFunction function,
xsltElemPreCompDeallocator freeFunc);
-XSLTPUBFUN int XSLTCALL
- xsltRegisterExtModuleElement
+XSLTPUBFUN int XSLTCALL
+ xsltRegisterExtModuleElement
(const xmlChar *name,
const xmlChar *URI,
xsltPreComputeFunction precomp,
xsltTransformFunction transform);
-XSLTPUBFUN xsltTransformFunction XSLTCALL
+XSLTPUBFUN xsltTransformFunction XSLTCALL
xsltExtElementLookup (xsltTransformContextPtr ctxt,
const xmlChar *name,
const xmlChar *URI);
-XSLTPUBFUN xsltTransformFunction XSLTCALL
+XSLTPUBFUN xsltTransformFunction XSLTCALL
xsltExtModuleElementLookup
(const xmlChar *name,
const xmlChar *URI);
-XSLTPUBFUN xsltPreComputeFunction XSLTCALL
- xsltExtModuleElementPreComputeLookup
- (const xmlChar *name,
- const xmlChar *URI);
-XSLTPUBFUN int XSLTCALL
- xsltUnregisterExtModuleElement
+XSLTPUBFUN xsltPreComputeFunction XSLTCALL
+ xsltExtModuleElementPreComputeLookup
+ (const xmlChar *name,
+ const xmlChar *URI);
+XSLTPUBFUN int XSLTCALL
+ xsltUnregisterExtModuleElement
(const xmlChar *name,
const xmlChar *URI);
@@ -177,28 +183,28 @@
typedef void (*xsltTopLevelFunction) (xsltStylesheetPtr style,
xmlNodePtr inst);
-XSLTPUBFUN int XSLTCALL
+XSLTPUBFUN int XSLTCALL
xsltRegisterExtModuleTopLevel
(const xmlChar *name,
const xmlChar *URI,
xsltTopLevelFunction function);
-XSLTPUBFUN xsltTopLevelFunction XSLTCALL
- xsltExtModuleTopLevelLookup
- (const xmlChar *name,
- const xmlChar *URI);
-XSLTPUBFUN int XSLTCALL
- xsltUnregisterExtModuleTopLevel
+XSLTPUBFUN xsltTopLevelFunction XSLTCALL
+ xsltExtModuleTopLevelLookup
+ (const xmlChar *name,
+ const xmlChar *URI);
+XSLTPUBFUN int XSLTCALL
+ xsltUnregisterExtModuleTopLevel
(const xmlChar *name,
const xmlChar *URI);
/* These 2 functions are deprecated for use within modules. */
-XSLTPUBFUN int XSLTCALL
+XSLTPUBFUN int XSLTCALL
xsltRegisterExtFunction (xsltTransformContextPtr ctxt,
const xmlChar *name,
const xmlChar *URI,
xmlXPathFunction function);
-XSLTPUBFUN int XSLTCALL
+XSLTPUBFUN int XSLTCALL
xsltRegisterExtElement (xsltTransformContextPtr ctxt,
const xmlChar *name,
const xmlChar *URI,
@@ -209,24 +215,24 @@
* Those are used by the XSLT (pre)processor.
*/
-XSLTPUBFUN int XSLTCALL
+XSLTPUBFUN int XSLTCALL
xsltRegisterExtPrefix (xsltStylesheetPtr style,
const xmlChar *prefix,
const xmlChar *URI);
-XSLTPUBFUN int XSLTCALL
+XSLTPUBFUN int XSLTCALL
xsltCheckExtPrefix (xsltStylesheetPtr style,
const xmlChar *URI);
XSLTPUBFUN int XSLTCALL
xsltCheckExtURI (xsltStylesheetPtr style,
const xmlChar *URI);
-XSLTPUBFUN int XSLTCALL
+XSLTPUBFUN int XSLTCALL
xsltInitCtxtExts (xsltTransformContextPtr ctxt);
-XSLTPUBFUN void XSLTCALL
+XSLTPUBFUN void XSLTCALL
xsltFreeCtxtExts (xsltTransformContextPtr ctxt);
-XSLTPUBFUN void XSLTCALL
+XSLTPUBFUN void XSLTCALL
xsltFreeExts (xsltStylesheetPtr style);
-XSLTPUBFUN xsltElemPreCompPtr XSLTCALL
+XSLTPUBFUN xsltElemPreCompPtr XSLTCALL
xsltPreComputeExtModuleElement
(xsltStylesheetPtr style,
xmlNodePtr inst);
@@ -235,16 +241,16 @@
* Used by exslt initialisation
*/
-XSLTPUBFUN xmlHashTablePtr XSLTCALL
- xsltGetExtInfo (xsltStylesheetPtr style,
+XSLTPUBFUN xmlHashTablePtr XSLTCALL
+ xsltGetExtInfo (xsltStylesheetPtr style,
const xmlChar *URI);
/**
* Test module http://xmlsoft.org/XSLT/
*/
-XSLTPUBFUN void XSLTCALL
+XSLTPUBFUN void XSLTCALL
xsltRegisterTestModule (void);
-XSLTPUBFUN void XSLTCALL
+XSLTPUBFUN void XSLTCALL
xsltDebugDumpExtensions (FILE * output);
Modified: trunk/reactos/include/reactos/libs/libxslt/libxslt.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxs…
==============================================================================
--- trunk/reactos/include/reactos/libs/libxslt/libxslt.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/libs/libxslt/libxslt.h [iso-8859-1] Mon Oct 19 21:28:32
2009
@@ -16,7 +16,7 @@
#include "config.h"
#endif
-#include "xsltconfig.h"
+#include <libxslt/xsltconfig.h>
#include <libxml/xmlversion.h>
#if !defined LIBXSLT_PUBLIC
Modified: trunk/reactos/include/reactos/libs/libxslt/xsltconfig.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxs…
==============================================================================
--- trunk/reactos/include/reactos/libs/libxslt/xsltconfig.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/libs/libxslt/xsltconfig.h [iso-8859-1] Mon Oct 19
21:28:32 2009
@@ -20,28 +20,28 @@
*
* the version string like "1.2.3"
*/
-#define LIBXSLT_DOTTED_VERSION "1.1.24"
+#define LIBXSLT_DOTTED_VERSION "1.1.26"
/**
* LIBXSLT_VERSION:
*
* the version number: 1.2.3 value is 10203
*/
-#define LIBXSLT_VERSION 10124
+#define LIBXSLT_VERSION 10126
/**
* LIBXSLT_VERSION_STRING:
*
* the version number string, 1.2.3 value is "10203"
*/
-#define LIBXSLT_VERSION_STRING "10124"
+#define LIBXSLT_VERSION_STRING "10126"
/**
* LIBXSLT_VERSION_EXTRA:
*
* extra version information, used to show a CVS compilation
*/
-#define LIBXSLT_VERSION_EXTRA "-CVS1070"
+#define LIBXSLT_VERSION_EXTRA "-GITv1.1.26"
/**
* WITH_XSLT_DEBUG:
@@ -124,6 +124,19 @@
#endif
/**
+ * Locale support
+ */
+#if 1
+#ifndef XSLT_LOCALE_XLOCALE
+#define XSLT_LOCALE_XLOCALE
+#endif
+#elif 0
+#ifndef XSLT_LOCALE_WINAPI
+#define XSLT_LOCALE_WINAPI
+#endif
+#endif
+
+/**
* ATTRIBUTE_UNUSED:
*
* This macro is used to flag unused function parameters to GCC
Added: trunk/reactos/include/reactos/libs/libxslt/xsltlocale.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxs…
==============================================================================
--- trunk/reactos/include/reactos/libs/libxslt/xsltlocale.h (added)
+++ trunk/reactos/include/reactos/libs/libxslt/xsltlocale.h [iso-8859-1] Mon Oct 19
21:28:32 2009
@@ -1,0 +1,57 @@
+/*
+ * Summary: Locale handling
+ * Description: Interfaces for locale handling. Needed for language dependent
+ * sorting.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Nick Wellnhofer
+ */
+
+#ifndef __XML_XSLTLOCALE_H__
+#define __XML_XSLTLOCALE_H__
+
+#include <libxml/xmlstring.h>
+
+#ifdef XSLT_LOCALE_XLOCALE
+
+#include <locale.h>
+#include <xlocale.h>
+
+#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)
+
+#include <windows.h>
+#include <winnls.h>
+
+typedef LCID xsltLocale;
+typedef wchar_t xsltLocaleChar;
+
+#else
+
+/*
+ * XSLT_LOCALE_NONE:
+ * Macro indicating that locale are not supported
+ */
+#ifndef XSLT_LOCALE_NONE
+#define XSLT_LOCALE_NONE
+#endif
+
+typedef void *xsltLocale;
+typedef xmlChar xsltLocaleChar;
+
+#endif
+
+xsltLocale xsltNewLocale(const xmlChar *langName);
+void xsltFreeLocale(xsltLocale locale);
+xsltLocaleChar *xsltStrxfrm(xsltLocale locale, const xmlChar *string);
+int xsltLocaleStrcmp(xsltLocale locale, const xsltLocaleChar *str1, const xsltLocaleChar
*str2);
+
+#endif /* __XML_XSLTLOCALE_H__ */
Propchange: trunk/reactos/include/reactos/libs/libxslt/xsltlocale.h
------------------------------------------------------------------------------
svn:eol-style = native
5506
days inactive
5506
days old
0 comments
1 participants
participants (1)
-
cwittich＠svn.reactos.org