VirtualBox

Changeset 104180 in vbox for trunk


Ignore:
Timestamp:
Apr 5, 2024 12:32:12 PM (10 months ago)
Author:
vboxsync
Message:

libxml2-2.12.6: Make it build for windows. bugref:10640

Location:
trunk/src/libs/libxml2-2.12.6
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/libs/libxml2-2.12.6/Makefile.kmk

    r104106 r104180  
    4242VBox-libxml2_CFLAGS.win    += -wd4305 # 'type cast' : truncation from 'xmlChar *' to 'long'
    4343VBox-libxml2_CFLAGS.win    += -wd4306 # 'type cast' : conversion from 'long' to 'void *' of greater size [TODO: check these out?]
     44VBox-libxml2_CFLAGS.win    += -wd4090 # 'function': different 'const' qualifiers
     45VBox-libxml2_CFLAGS.win    += -wd4047 # dwarning C4047: 'function': 'xmlMutexPtr' differs in levels of indirection from 'xmlMutexPtr *'
     46VBox-libxml2_CFLAGS.win    += -wd4024 # warning C4024: 'xmlMutexLock': different types for formal and actual parameter 1
     47VBox-libxml2_CFLAGS.win    += -wd4098 # warning C4098: 'xmlInitMemoryInternal': 'void' function returning a value
     48VBox-libxml2_CFLAGS.win    += -wd4703 # warning C4703: potentially uninitialized local pointer variable 'nsuri' used
     49VBox-libxml2_CFLAGS.win    += -wd4013 # warning C4013: 'sprintf' undefined; assuming extern returning int
    4450if "$(VBOX_VCC_TOOL_STEM)" >= "VCC120"
    4551 VBox-libxml2_CFLAGS.win   += -wd4311 # parser.c(1346) : warning C4311: 'type cast' : pointer truncation from 'void *' to 'long'
    … …  
    6369        debugXML.c \
    6470        dict.c \
    65         DOCBparser.c \
    6671        encoding.c \
    6772        entities.c \
    … …  
    7378        legacy.c \
    7479        list.c \
     80        nanohttp.c \
    7581        parser.c \
    7682        parserInternals.c \

  • trunk/src/libs/libxml2-2.12.6/catalog.c

    r104106 r104180  
    7676#if defined(_WIN32) && defined(_MSC_VER)
    7777#undef XML_XML_DEFAULT_CATALOG
    78 static char XML_XML_DEFAULT_CATALOG[256] = "file://" SYSCONFDIR "/xml/catalog";
     78//static char XML_XML_DEFAULT_CATALOG[256] = "file://" SYSCONFDIR "/xml/catalog";
     79static char XML_XML_DEFAULT_CATALOG[256] = "file:///etc/xml/catalog";
    7980#if !defined(_WINDOWS_)
    8081void* __stdcall GetModuleHandleA(const char*);

  • trunk/src/libs/libxml2-2.12.6/include/libxml/xmlversion.h

    r104169 r104180  
    271271 * Whether iconv support is available
    272272 */
    273 #if 1
     273#if 0
    274274#define LIBXML_ICONV_ENABLED
    275275#endif

  • trunk/src/libs/libxml2-2.12.6/include/vboxconfig.h

    r104106 r104180  
    436436#undef LIBXML_ICONV_ENABLED
    437437
     438#define XML_HIDDEN
     439#define ATTRIBUTE_NO_SANITIZE_INTEGER
     440#define ATTRIBUTE_NO_SANITIZE(arg)
     441#undef NAN

  • trunk/src/libs/libxml2-2.12.6/libxml.h

    r104169 r104180  
    2323#endif
    2424
     25#if defined(VBOX)
     26#include <vboxconfig.h>
     27#include <libxml/xmlversion.h>
     28#endif
     29
     30
    2531#if defined(macintosh)
    2632#include "config-mac.h"
    … …  
    3440 */
    3541#include "config.h"
    36 #include <libxml/xmlversion.h>
    37 #elif defined(VBOX)
    38 #include <vboxconfig.h>
    3942#include <libxml/xmlversion.h>
    4043#else

  • trunk/src/libs/libxml2-2.12.6/xmlmemory.c

    r104106 r104180  
    2020 */
    2121#ifdef DEBUG_MEMORY_LOCATION
    22 #ifndef MEM_LIST
    23 #define MEM_LIST /* keep a list of all the allocated memory blocks */
    24 #endif
     22 #ifndef MEM_LIST
     23  #define MEM_LIST /* keep a list of all the allocated memory blocks */
     24 #endif
    2525#endif
    2626
    … …  
    3333#include "private/threads.h"
    3434
     35static int xmlMemInitialized = 0;
    3536static unsigned long  debugMemSize = 0;
    3637static unsigned long  debugMemBlocks = 0;
    3738static unsigned long  debugMaxMemSize = 0;
    38 static xmlMutex xmlMemMutex;
     39static xmlMutexPtr xmlMemMutex = NULL;
    3940
    4041void xmlMallocBreakpoint(void);
    … …  
    4748
    4849#if !defined(LIBXML_THREAD_ENABLED) && !defined(LIBXML_THREAD_ALLOC_ENABLED)
    49 #ifdef xmlMalloc
    50 #undef xmlMalloc
    51 #endif
    52 #ifdef xmlRealloc
    53 #undef xmlRealloc
    54 #endif
    55 #ifdef xmlMemStrdup
    56 #undef xmlMemStrdup
    57 #endif
     50 #ifdef xmlMalloc
     51 #undef xmlMalloc
     52 #endif
     53
     54 #ifdef xmlRealloc
     55 #undef xmlRealloc
     56 #endif
     57
     58 #ifdef xmlMemStrdup
     59 #undef xmlMemStrdup
     60 #endif
    5861#endif
    5962
    … …  
    8992#define ALIGN_SIZE  sizeof(double)
    9093#endif
     94
    9195#define HDR_SIZE    sizeof(MEMHDR)
    9296#define RESERVE_SIZE (((HDR_SIZE + (ALIGN_SIZE-1)) \
    … …  
    845849void
    846850xmlInitMemoryInternal(void) {
     851
    847852#ifdef VBOX
    848853     const char *breakpoint;
    … …  
    850855     char *breakpoint;
    851856#endif
    852 #endif
     857
    853858#ifdef DEBUG_MEMORY
    854859     xmlGenericError(xmlGenericErrorContext,

  • trunk/src/libs/libxml2-2.12.6/xmlschemastypes.c

    r104106 r104180  
    3636#include "private/error.h"
    3737
    38 #ifndef LIBXML_XPATH_ENABLED
    3938#ifndef VBOX /* Avoid warnings about redefining DEBUG */
    4039#define DEBUG
    4140#endif /* !VBOX */
    42 
    4341
    4442#ifndef LIBXML_XPATH_ENABLED

  • trunk/src/libs/libxml2-2.12.6/xpath.c

    r104106 r104180  
    167167void
    168168xmlInitXPathInternal(void) {
    169 #if defined(NAN) && defined(INFINITY)
     169#if defined(NAN) && defined(INFINITY) && !defined(VBOX)
    170170    xmlXPathNAN = NAN;
    171171    xmlXPathPINF = INFINITY;
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette