Changeset 96464 in vbox for trunk/src/libs/libxml2-2.9.14

Timestamp:

Aug 24, 2022 10:34:31 PM (2 years ago)

Author:

vboxsync

Message:

libs/libxml2-2.9.14: Made it build in no-CRT mode. bugref:10261

Location:

trunk/src/libs/libxml2-2.9.14

Files:

• Makefile.kmk (modified) (1 diff)
• xmlIO.c (modified) (8 diffs)
• xmlmemory.c (modified) (1 diff)

trunk/src/libs/libxml2-2.9.14/Makefile.kmk

@@ -112 +112 @@
 VBox-libxml2-static_TEMPLATE = VBoxR3StaticNonPedantic
 VBox-libxml2-static_EXTENDS = VBox-libxml2
-
+ifdef VBOX_WITH_NOCRT_STATIC
+ VBox-libxml2-static_DEFS = $(VBox-libxml2_DEFS) IPRT_NO_CRT_FOR_3RD_PARTY
+endif
 
 include $(FILE_KBUILD_SUB_FOOTER)

trunk/src/libs/libxml2-2.9.14/xmlIO.c

@@ -191 +191 @@
 };
 
-#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
+#if (defined(_WIN32) || defined (__DJGPP__)) && !defined (__CYGWIN__) && !defined(IPRT_NO_CRT)
 /**
  * __xmlIOWin32UTF8ToWChar:
@@ -596 +596 @@
  ************************************************************************/
 
-#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
+#if (defined(_WIN32) || defined (__DJGPP__)) && !defined (__CYGWIN__) && !defined(IPRT_NO_CRT)
 
 /**
@@ -697 +697 @@
 {
 #ifdef HAVE_STAT
-#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
+#if (defined(_WIN32) || defined (__DJGPP__)) && !defined (__CYGWIN__) && !defined(IPRT_NO_CRT)
     struct _stat stat_buffer;
 #else
@@ -707 +707 @@
 
 #ifdef HAVE_STAT
-#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
+#if (defined(_WIN32) || defined (__DJGPP__)) && !defined (__CYGWIN__) && !defined(IPRT_NO_CRT)
     /*
      * On Windows stat and wstat do not work with long pathname,
@@ -864 +864 @@
 #endif
 
-#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
+#if (defined(_WIN32) || defined (__DJGPP__)) && !defined (__CYGWIN__) && !defined(IPRT_NO_CRT)
     fd = xmlWrapOpenUtf8(path, 0);
 #else
@@ -937 +937 @@
         return(NULL);
 
-#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
+#if (defined(_WIN32) || defined (__DJGPP__)) && !defined (__CYGWIN__) && !defined(IPRT_NO_CRT)
     fd = xmlWrapOpenUtf8(path, 1);
 #elif(__MVS__)
@@ -1129 +1129 @@
         return(NULL);
 
-#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
+#if (defined(_WIN32) || defined (__DJGPP__)) && !defined (__CYGWIN__) && !defined(IPRT_NO_CRT)
     fd = xmlWrapGzOpenUtf8(path, "rb");
 #else
@@ -1206 +1206 @@
         return(NULL);
 
-#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
+#if (defined(_WIN32) || defined (__DJGPP__)) && !defined (__CYGWIN__) && !defined(IPRT_NO_CRT)
     fd = xmlWrapGzOpenUtf8(path, mode);
 #else

trunk/src/libs/libxml2-2.9.14/xmlmemory.c

@@ -965 +965 @@
 {
 #ifdef HAVE_STDLIB_H
+#ifdef VBOX
+     const char *breakpoint;
+#else
      char *breakpoint;
+#endif
 #endif
 #ifdef DEBUG_MEMORY