[Scummvm-git-logs] scummvm master -> 312b868b52b8b62e58c452fbcb1af88000bbae2a

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
312b868b52 ULTIMA: ULTIMA4: Fix compilation on platforms without 'alignas' C++11 keyword


Commit: 312b868b52b8b62e58c452fbcb1af88000bbae2a
    https://github.com/scummvm/scummvm/commit/312b868b52b8b62e58c452fbcb1af88000bbae2a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-18T00:22:42+01:00

Commit Message:
ULTIMA: ULTIMA4: Fix compilation on platforms without 'alignas' C++11 keyword

Changed paths:
    engines/ultima/ultima4/game/item.h


diff --git a/engines/ultima/ultima4/game/item.h b/engines/ultima/ultima4/game/item.h
index cb991f6a96a..e4ebdff12f1 100644
--- a/engines/ultima/ultima4/game/item.h
+++ b/engines/ultima/ultima4/game/item.h
@@ -43,7 +43,11 @@ class Items;
 typedef bool (Items::*IsInInventoryProc)(int item);
 typedef void (Items::*InventoryActionProc)(int item);
 
-struct alignas(8) ItemLocation {
+struct
+#ifndef NO_CXX11_ALIGNAS
+alignas(8)
+#endif
+ItemLocation {
 	const char *_name;
 	const char *_shortName;
 	const char *_locationLabel;