Changeset 98718 in vbox for trunk/src/VBox/Main

Timestamp:

Feb 24, 2023 11:09:59 AM (2 years ago)

Author:

vboxsync

Message:

Main/VBoxVolInfo: Don't link directly against libdevmapper but use the IPRT runtime loader to get rid of the buildtime dependency, bugref:10367 [make scm happy]

Location:

trunk/src/VBox/Main/src-helper-apps/VBoxVolInfo

Files:

• VBoxVolInfo.cpp (modified) (1 diff)
• libdevmapper-calls.h (modified) (1 diff)
• libdevmapper.h (modified) (2 diffs)

trunk/src/VBox/Main/src-helper-apps/VBoxVolInfo/VBoxVolInfo.cpp

@@ -37 +37 @@
 #include <unistd.h>
 
-#include <VBox/err.h>
+#include <VBox/errcore.h>
 
 #include "libdevmapper.h"
+
 
 /*********************************************************************************************************************************

trunk/src/VBox/Main/src-helper-apps/VBoxVolInfo/libdevmapper-calls.h

@@ -23 +23 @@
  * along with this program; if not, see <https://www.gnu.org/licenses>.
  *
- * The contents of this file may alternatively be used under the terms
- * of the Common Development and Distribution License Version 1.0
- * (CDDL), a copy of it is provided in the "COPYING.CDDL" file included
- * in the VirtualBox distribution, in which case the provisions of the
- * CDDL are applicable instead of those of the GPL.
- *
- * You may elect to license modified versions of this file under the
- * terms and conditions of either the GPL or the CDDL or both.
- *
- * SPDX-License-Identifier: GPL-3.0-only OR CDDL-1.0
+ * SPDX-License-Identifier: GPL-3.0-only
  */
 

trunk/src/VBox/Main/src-helper-apps/VBoxVolInfo/libdevmapper.h

@@ -23 +23 @@
  * along with this program; if not, see <https://www.gnu.org/licenses>.
  *
- * The contents of this file may alternatively be used under the terms
- * of the Common Development and Distribution License Version 1.0
- * (CDDL), a copy of it is provided in the "COPYING.CDDL" file included
- * in the VirtualBox distribution, in which case the provisions of the
- * CDDL are applicable instead of those of the GPL.
- *
- * You may elect to license modified versions of this file under the
- * terms and conditions of either the GPL or the CDDL or both.
- *
- * SPDX-License-Identifier: GPL-3.0-only OR CDDL-1.0
+ * SPDX-License-Identifier: GPL-3.0-only
  */
 
-#ifndef VBOX_INCLUDED_libdevmapper_h
-#define VBOX_INCLUDED_libdevmapper_h
+#ifndef MAIN_INCLUDED_SRC_src_helper_apps_VBoxVolInfo_libdevmapper_h
+#define MAIN_INCLUDED_SRC_src_helper_apps_VBoxVolInfo_libdevmapper_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -108 +99 @@
 #undef VBOX_LIBDEVMAPPER_GENERATE_HEADER
 
-#endif /* !VBOX_INCLUDED_libdevmapper_h */
+#endif /* !MAIN_INCLUDED_SRC_src_helper_apps_VBoxVolInfo_libdevmapper_h */