mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(libxml) LIBXML_C14N_ENABLED removed

Browse Source
This commit is contained in:
twinaphex 2012-11-17 23:43:39 +01:00
parent 08d34130ef
commit 73162c7794
4 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/native/libxml2/libxml/c14n.h
View File

@ -16,7 +16,5 @@
*/
#ifndef __XML_C14N_H__
#define __XML_C14N_H__
#ifdef LIBXML_C14N_ENABLED
#endif /* LIBXML_C14N_ENABLED */
#endif /* __XML_C14N_H__ */

9
android/native/libxml2/libxml/xmlversion.h
View File

@ -121,15 +121,6 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
#define LIBXML_VALID_ENABLED
#endif
/**
* LIBXML_C14N_ENABLED:
*
* Whether the Canonicalization support is configured in
*/
#if 0
#define LIBXML_C14N_ENABLED
#endif
/**
* LIBXML_ICONV_ENABLED:
*

4
android/native/libxml2/parser.c
View File

@ -803,11 +803,7 @@ xmlHasFeature(xmlFeature feature)
case XML_WITH_LEGACY:
return(0);
case XML_WITH_C14N:
#ifdef LIBXML_C14N_ENABLED
return(1);
#else
return(0);
#endif
case XML_WITH_CATALOG:
return(0);
case XML_WITH_XPATH:

27
android/native/libxml2/xmllint.c
View File

@ -79,9 +79,6 @@
#include <libxml/xmlerror.h>
#include <libxml/globals.h>
#include <libxml/xmlreader.h>
#ifdef LIBXML_C14N_ENABLED
#include <libxml/c14n.h>
#endif
#ifndef XML_XML_DEFAULT_CATALOG
#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog"
@ -134,11 +131,6 @@ static xmllintReturnCode progresult = XMLLINT_RETURN_OK;
static int timing = 0;
static int generate = 0;
static int dropdtd = 0;
#ifdef LIBXML_C14N_ENABLED
static int canonical = 0;
static int canonical_11 = 0;
static int exc_canonical = 0;
#endif
#ifdef LIBXML_READER_ENABLED
static int stream = 0;
static int walker = 0;
@ -2168,8 +2160,6 @@ static void usage(const char *name) {
printf("\t--c14n : save in W3C canonical format v1.0 (with comments)\n");
printf("\t--c14n11 : save in W3C canonical format v1.1 (with comments)\n");
printf("\t--exc-c14n : save in W3C exclusive canonical format (with comments)\n");
#ifdef LIBXML_C14N_ENABLED
#endif /* LIBXML_C14N_ENABLED */
printf("\t--nsclean : remove redundant namespace declarations\n");
printf("\t--testIO : test user I/O support\n");
printf("\t--auto : generate a small doc on the fly\n");
@ -2343,23 +2333,6 @@ main(int argc, char **argv) {
xmlPedanticParserDefault(1);
options |= XML_PARSE_PEDANTIC;
}
#ifdef LIBXML_C14N_ENABLED
else if ((!strcmp(argv[i], "-c14n")) ||
(!strcmp(argv[i], "--c14n"))) {
canonical++;
options |= XML_PARSE_NOENT | XML_PARSE_DTDATTR | XML_PARSE_DTDLOAD;
}
else if ((!strcmp(argv[i], "-c14n11")) ||
(!strcmp(argv[i], "--c14n11"))) {
canonical_11++;
options |= XML_PARSE_NOENT | XML_PARSE_DTDATTR | XML_PARSE_DTDLOAD;
}
else if ((!strcmp(argv[i], "-exc-c14n")) ||
(!strcmp(argv[i], "--exc-c14n"))) {
exc_canonical++;
options |= XML_PARSE_NOENT | XML_PARSE_DTDATTR | XML_PARSE_DTDLOAD;
}
#endif
else if ((!strcmp(argv[i], "-encode")) ||
(!strcmp(argv[i], "--encode"))) {
i++;