Changeset 108334 in vbox

Timestamp:

Feb 21, 2025 3:23:06 PM (3 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

167686

Message:

libs/xpcom18a4: Replace xpidl with xpidl-new which enables us to drop the dreaded libIDL dependency (library is dead for well over a decade), bugref:10321 [build fixes]

Location:

trunk/src/libs/xpcom18a4/xpcom/typelib/xpidl

Files:

• xpidl_header.c (modified) (1 diff)
• xpidl_idl.c (modified) (3 diffs)

trunk/src/libs/xpcom18a4/xpcom/typelib/xpidl/xpidl_header.c

@@ -377 +377 @@
     {
         fputs("[", pFile);
-        for (uint32_t i = 0; i < pIt->cAttrs; i++)
+        uint32_t i;
+        for (i = 0; i < pIt->cAttrs; i++)
         {
             if (pIt->aAttrs[i].pszVal)

trunk/src/libs/xpcom18a4/xpcom/typelib/xpidl/xpidl_idl.c

@@ -263 +263 @@
 
         /* Make sure we don't miss any %{C++ %} blocks. */
-        if (   !strncmp(pTok->Type.Comment.pszComment, RT_STR_TUPLE("%{C++"))
-            || !strncmp(pTok->Type.Comment.pszComment, RT_STR_TUPLE("%{ C++")))
+        if (   !strncmp(pTok->Type.Comment.pszComment, "%{C++", sizeof("%{C++") - 1)
+            || !strncmp(pTok->Type.Comment.pszComment, "%{ C++", sizeof("%{ C++") - 1))
         {
             if (pfRawBlock)
@@ -958 +958 @@
                 return xpidlParseError(pThis, pInput, NULL, rc, "Lexer: Failed to query punctuator token with %Rrc", rc);
 
-            size_t cchIntro =   !strncmp(pTok->Type.Comment.pszComment, RT_STR_TUPLE("%{C++"))
+            size_t cchIntro =   !strncmp(pTok->Type.Comment.pszComment, "%{C++", sizeof("%{C++") - 1)
                               ? 6  /* Assumes a newline after %{C++ */
                               : 7; /* Assumes a newline after %{C++ */
@@ -1242 +1242 @@
             {
                 /* Could be a raw block, check that the string starts with %{C++. */
-                if (   !strncmp(pTok->Type.Comment.pszComment, RT_STR_TUPLE("%{C++"))
-                    || !strncmp(pTok->Type.Comment.pszComment, RT_STR_TUPLE("%{ C++")))
+                if (   !strncmp(pTok->Type.Comment.pszComment, "%{C++", sizeof("%{C++") - 1)
+                    || !strncmp(pTok->Type.Comment.pszComment, "%{ C++", sizeof("%{ C++") - 1))
                 {
-                    size_t cchIntro =   !strncmp(pTok->Type.Comment.pszComment, RT_STR_TUPLE("%{C++"))
+                    size_t cchIntro =   !strncmp(pTok->Type.Comment.pszComment, "%{C++", sizeof("%{C++") - 1)
                                       ? 6  /* Assumes a newline after %{C++ */
                                       : 7; /* Assumes a newline after %{C++ */