Changeset 92831 in vbox

Timestamp:

Dec 8, 2021 5:02:05 PM (3 years ago)

Author:

vboxsync

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

148757

Message:

Main: bugref:1909: Fixed compilation errors

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxManageHelp.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

@@ -360 +360 @@
                 '    PCRTMSGREFENTRY *papHelpEntries;' \
                 '    const uint32_t   cHelpEntries;' \
-                '} HELP_LANG_ENTRY;' \
+                '} HELP_LANG_ENTRY, *PHELP_LANG_ENTRY;' \
                 '' \
                 'extern HELP_LANG_ENTRY g_apHelpLangEntries[];' \

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -114 +114 @@
     uint32_t cFound = 0;
 #ifdef VBOX_WITH_VBOXMANAGE_NLS
-    HELP_LANG_ENTRY *pHelpLangEntry[2] = {(HELP_LANG_ENTRY *)ASMAtomicReadPtr(&g_pHelpLangEntry), &g_apHelpLangEntries[0] };
+    PHELP_LANG_ENTRY pHelpLangEntry[2] = {ASMAtomicReadPtrT(&g_pHelpLangEntry, PHELP_LANG_ENTRY), &g_apHelpLangEntries[0] };
 #else
-    HELP_LANG_ENTRY *pHelpLangEntry[1] = {(HELP_LANG_ENTRY *)g_pHelpLangEntry};
+    PHELP_LANG_ENTRY pHelpLangEntry[1] = {(PHELP_LANG_ENTRY)g_pHelpLangEntry};
 #endif
     /* Try to find translated, then untranslated */
@@ -176 +176 @@
     uint32_t cFound = 0;
 #ifdef VBOX_WITH_VBOXMANAGE_NLS
-    HELP_LANG_ENTRY *pHelpLangEntry[2] = {(HELP_LANG_ENTRY *)ASMAtomicReadPtr(&g_pHelpLangEntry), &g_apHelpLangEntries[0] };
+    PHELP_LANG_ENTRY pHelpLangEntry[2] = {ASMAtomicReadPtrT(&g_pHelpLangEntry, PHELP_LANG_ENTRY), &g_apHelpLangEntries[0] };
 #else
-    HELP_LANG_ENTRY *pHelpLangEntry[1] = {(HELP_LANG_ENTRY *)g_pHelpLangEntry};
+    PHELP_LANG_ENTRY pHelpLangEntry[1] = {(PHELP_LANG_ENTRY)g_pHelpLangEntry};
 #endif
     /* Try to find translated, then untranslated */
@@ -1036 +1036 @@
         uint32_t cPendingBlankLines = 0;
 #ifdef VBOX_WITH_VBOXMANAGE_NLS
-        HELP_LANG_ENTRY *pHelpLangEntry = (HELP_LANG_ENTRY *)ASMAtomicReadPtr(&g_pHelpLangEntry);
+        PHELP_LANG_ENTRY pHelpLangEntry = ASMAtomicReadPtrT(&g_pHelpLangEntry, PHELP_LANG_ENTRY);
 #else
-        HELP_LANG_ENTRY *pHelpLangEntry = (HELP_LANG_ENTRY *)g_pHelpLangEntry;
+        PHELP_LANG_ENTRY pHelpLangEntry = (PHELP_LANG_ENTRY)g_pHelpLangEntry;
 #endif
         for (uint32_t i = 0; i < pHelpLangEntry->cHelpEntries; i++)