Changeset 85276 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jul 12, 2020 1:47:12 PM (5 years ago)

Author:

vboxsync

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

139253

Message:

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

File:

• trunk/src/VBox/Main/src-server/VRDEServerImpl.cpp (modified) (2 diffs)

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

@@ -451 +451 @@
 }
 
+#if RT_CLANG_PREREQ(11, 0) && !RT_CLANG_PREREQ(13, 0) /*assuming this issue will be fixed eventually*/
+static int loadVRDELibrary(const char *pszLibraryName, RTLDRMOD *phmod, void *ppfn)
+#else
 static int loadVRDELibrary(const char *pszLibraryName, RTLDRMOD *phmod, PFNVRDESUPPORTEDPROPERTIES *ppfn)
+#endif
 {
     int rc = VINF_SUCCESS;
@@ -543 +547 @@
         PFNVRDESUPPORTEDPROPERTIES pfn = NULL;
         RTLDRMOD hmod = NIL_RTLDRMOD;
+#if RT_CLANG_PREREQ(11, 0) && !RT_CLANG_PREREQ(13, 0) /*assuming this issue will be fixed eventually*/
+        vrc = loadVRDELibrary(strVrdeLibrary.c_str(), &hmod, (void **)&pfn);
+#else
         vrc = loadVRDELibrary(strVrdeLibrary.c_str(), &hmod, &pfn);
+#endif
         Log(("VRDEPROP: load library [%s] rc %Rrc\n", strVrdeLibrary.c_str(), vrc));
         if (RT_SUCCESS(vrc))