Changeset 85252 in vbox for trunk/src

Timestamp:

Jul 11, 2020 11:26:04 PM (4 years ago)

Author:

vboxsync

Message:

Main/HostVideoInputDeviceImpl.cpp: Workaround for Clang 11 nothrow/PPFN issue. bugref:9790

File:

• trunk/src/VBox/Main/src-server/HostVideoInputDeviceImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/HostVideoInputDeviceImpl.cpp

@@ -131 +131 @@
 typedef FNVBOXHOSTWEBCAMLIST *PFNVBOXHOSTWEBCAMLIST;
 
+#if RT_CLANG_PREREQ(11, 0) && !RT_CLANG_PREREQ(13, 0) /*assuming this issue will be fixed eventually*/
+static int loadHostWebcamLibrary(const char *pszPath, RTLDRMOD *phmod, void **ppfn)
+#else
 static int loadHostWebcamLibrary(const char *pszPath, RTLDRMOD *phmod, PFNVBOXHOSTWEBCAMLIST *ppfn)
+#endif
 {
     int rc;
@@ -185 +189 @@
         PFNVBOXHOSTWEBCAMLIST pfn = NULL;
         RTLDRMOD hmod = NIL_RTLDRMOD;
+#if RT_CLANG_PREREQ(11, 0) && !RT_CLANG_PREREQ(13, 0) /*assuming this issue will be fixed eventually*/
+        int vrc = loadHostWebcamLibrary(strLibrary.c_str(), &hmod, (void **)&pfn);
+#else
         int vrc = loadHostWebcamLibrary(strLibrary.c_str(), &hmod, &pfn);
+#endif
 
         LogRel(("Load [%s] vrc=%Rrc\n", strLibrary.c_str(), vrc));
@@ -193 +201 @@
             uint64_t u64Result = S_OK;
             vrc = pfn(hostWebcamAdd, pList, &u64Result);
-            Log(("VBoxHostWebcamList vrc %Rrc, result 0x%08X\n", vrc, u64Result));
+            Log(("VBoxHostWebcamList vrc %Rrc, result 0x%08RX64\n", vrc, u64Result));
             if (RT_FAILURE(vrc))
             {