[Scummvm-git-logs] scummvm master -> aa2ab770806250e2b1f64e50082f3b695529d5ba

[aquadran]

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:
aa2ab77080 ICB: Fix compilation failure due usage C++ header cstring.


Commit: aa2ab770806250e2b1f64e50082f3b695529d5ba
    https://github.com/scummvm/scummvm/commit/aa2ab770806250e2b1f64e50082f3b695529d5ba
Author: Fiodar Stryzhniou (fedor_qd at mail.ru)
Date: 2021-06-26T13:49:21+02:00

Commit Message:
ICB: Fix compilation failure due usage C++ header cstring.

Get rid from legacy "typedef struct ...".

Changed paths:
    engines/icb/common/px_array.h
    engines/icb/common/px_walkarea_integer.h


diff --git a/engines/icb/common/px_array.h b/engines/icb/common/px_array.h
index 6fe453fe8d..7143b2b149 100644
--- a/engines/icb/common/px_array.h
+++ b/engines/icb/common/px_array.h
@@ -28,7 +28,6 @@
 #ifndef ICB_LIBRARY_CMYACTARRAY
 #define ICB_LIBRARY_CMYACTARRAY
 
-#include <cstring>
 #include "engines/icb/common/px_rcutypes.h"
 
 namespace ICB {
diff --git a/engines/icb/common/px_walkarea_integer.h b/engines/icb/common/px_walkarea_integer.h
index ab56e37581..25f1256555 100644
--- a/engines/icb/common/px_walkarea_integer.h
+++ b/engines/icb/common/px_walkarea_integer.h
@@ -34,16 +34,16 @@ namespace ICB {
 
 #define INTEGER_WALKAREA_API_SCHEMA 1
 
-typedef struct __point { // 3D integer coordinate representation
+struct __point { // 3D integer coordinate representation
 	__point(void) : x(0), y(0), z(0) { ; }
 	__point(int32 X, int32 Y, int32 Z) : x(X), y(Y), z(Z) { ; }
 
 	int32 x;
 	int32 y;
 	int32 z;
-} __point;
+};
 
-typedef struct {
+struct __aWalkArea{
 	char name[32];         // Name of the walkarea
 	char cameraCluster[8]; // Hashed cameraName value
 
@@ -59,7 +59,7 @@ typedef struct {
 	__point points[1]; // The points themselves (spline is always closed)
 
 	char cameraName[1]; // Name of associated camera (DWORD aligned)
-} __aWalkArea;
+};
 
 class INTEGER_WalkAreaFile {
 public: