Merge branch 'fix-compilation-vs2022'

This commit is contained in:
Luke Usher 2024-05-22 12:50:04 +01:00
commit eb2381eb8e
2 changed files with 2 additions and 1 deletions

View File

@ -26,6 +26,7 @@
#ifndef CXBXUTIL_H
#define CXBXUTIL_H
#include <algorithm>
#include <stdexcept>
#include "xbox_types.h"
#include "Cxbx.h"

View File

@ -64,7 +64,7 @@ INT_PTR CALLBACK DlgAboutProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
SendMessageW(hWndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon);
// Build the Tab Control
constexpr size_t text_len = longest_str({ "About", "Contributors", "License" }) + 1;
const size_t text_len = longest_str({ "About", "Contributors", "License" }) + 1;
char text[text_len];
TCITEM tabInfo;
memset(&tabInfo, 0, sizeof(tabInfo));