Changeset 92826 in vbox for trunk/src/VBox

Timestamp:

Dec 8, 2021 4:06:42 PM (3 years ago)

Author:

vboxsync

Message:

Main: bugref:1909: Fixed compilation errors

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.cpp (modified) (1 diff)
• VBoxManageHelp.cpp (modified) (3 diffs)

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

@@ -267 +267 @@
 {
 #ifdef VBOX_WITH_VBOXMANAGE_NLS
-    if (pszLang == NULL || pszLang[0] == 0 || pszLang[0] == 'C' && pszLang[1] == 0)
+    if (pszLang == NULL || pszLang[0] == 0 || (pszLang[0] == 'C' && pszLang[1] == 0))
         pszLang = "en_US";
     void *pHelpLangEntry = NULL;

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

@@ -114 +114 @@
     uint32_t cFound = 0;
 #ifdef VBOX_WITH_VBOXMANAGE_NLS
-    HELP_LANG_ENTRY *pHelpLangEntry[2] = {ASMAtomicReadPtrT(&g_pHelpLangEntry, HELP_LANG_ENTRY *), &g_apHelpLangEntries[0] };
+    HELP_LANG_ENTRY *pHelpLangEntry[2] = {(HELP_LANG_ENTRY *)ASMAtomicReadPtr(&g_pHelpLangEntry), &g_apHelpLangEntries[0] };
 #else
     HELP_LANG_ENTRY *pHelpLangEntry[1] = {(HELP_LANG_ENTRY *)g_pHelpLangEntry};
@@ -176 +176 @@
     uint32_t cFound = 0;
 #ifdef VBOX_WITH_VBOXMANAGE_NLS
-    HELP_LANG_ENTRY *pHelpLangEntry[2] = {ASMAtomicReadPtrT(&g_pHelpLangEntry, HELP_LANG_ENTRY *), &g_apHelpLangEntries[0] };
+    HELP_LANG_ENTRY *pHelpLangEntry[2] = {(HELP_LANG_ENTRY *)ASMAtomicReadPtr(&g_pHelpLangEntry), &g_apHelpLangEntries[0] };
 #else
     HELP_LANG_ENTRY *pHelpLangEntry[1] = {(HELP_LANG_ENTRY *)g_pHelpLangEntry};
@@ -1036 +1036 @@
         uint32_t cPendingBlankLines = 0;
 #ifdef VBOX_WITH_VBOXMANAGE_NLS
-        HELP_LANG_ENTRY *pHelpLangEntry = ASMAtomicReadPtrT(&g_pHelpLangEntry, HELP_LANG_ENTRY *);
+        HELP_LANG_ENTRY *pHelpLangEntry = (HELP_LANG_ENTRY *)ASMAtomicReadPtr(&g_pHelpLangEntry);
 #else
         HELP_LANG_ENTRY *pHelpLangEntry = (HELP_LANG_ENTRY *)g_pHelpLangEntry;