Index: third_party/libxslt/libxslt/xsltInternals.h |
=================================================================== |
--- third_party/libxslt/libxslt/xsltInternals.h (revision 39981) |
+++ third_party/libxslt/libxslt/xsltInternals.h (working copy) |
@@ -21,6 +21,7 @@ |
#include <libxml/xmlstring.h> |
#include <libxslt/xslt.h> |
#include "xsltexports.h" |
+#include "xsltlocale.h" |
#include "numbersInternals.h" |
#ifdef __cplusplus |
@@ -1045,6 +1046,7 @@ |
int descending; /* sort */ |
const xmlChar *lang; /* sort */ |
int has_lang; /* sort */ |
+ xsltLocale locale; /* sort */ |
const xmlChar *case_order; /* sort */ |
int lower_first; /* sort */ |
@@ -1246,10 +1248,6 @@ |
const xmlChar *nsName; |
}; |
-#define XSLT_ELEMENT_CATEGORY_XSLT 0 |
-#define XSLT_ELEMENT_CATEGORY_EXTENSION 1 |
-#define XSLT_ELEMENT_CATEGORY_LRE 2 |
- |
/** |
* xsltCompilerNodeInfo: |
* |
@@ -1381,6 +1379,7 @@ |
int descending; /* sort */ |
const xmlChar *lang; /* sort */ |
int has_lang; /* sort */ |
+ xsltLocale locale; /* sort */ |
const xmlChar *case_order; /* sort */ |
int lower_first; /* sort */ |
@@ -1417,9 +1416,6 @@ |
#endif /* XSLT_REFACTORED */ |
-#define XSLT_VAR_GLOBAL 1<<0 |
-#define XSLT_VAR_IN_SELECT 1<<1 |
-#define XSLT_TCTXT_VARIABLE(c) ((xsltStackElemPtr) (c)->contextVariable) |
/* |
* The in-memory structure corresponding to an XSLT Variable |
* or Param. |
@@ -1778,6 +1774,7 @@ |
exits */ |
xmlDocPtr localRVTBase; |
int keyInitLevel; /* Needed to catch recursive keys issues */ |
+ int funcLevel; /* Needed to catch recursive functions issues */ |
}; |
/** |