[Scummvm-git-logs] scummvm master -> 66b8cf9cac3b7a8a9786b87b123968840d4ebc47

[lephilousophe]

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:
66b8cf9cac COMMON: Fix build when uint32_t and uint32 are not defined the same


Commit: 66b8cf9cac3b7a8a9786b87b123968840d4ebc47
    https://github.com/scummvm/scummvm/commit/66b8cf9cac3b7a8a9786b87b123968840d4ebc47
Author: Philippe Valembois (lephilousophe at users.sourceforge.net)
Date: 2020-06-07T12:02:55+02:00

Commit Message:
COMMON: Fix build when uint32_t and uint32 are not defined the same

FriBidiChar is mapped to uint32_t (from stdint.h) while U32String is
composed of uint32 (from scummsys.h/config.h). On some platforms those
two types aren't defined using the same base type (long int vs int) and
compilation errors occur.

Changed paths:
    common/unicode-bidi.cpp


diff --git a/common/unicode-bidi.cpp b/common/unicode-bidi.cpp
index 5921d2fda2..c6b2642b9b 100644
--- a/common/unicode-bidi.cpp
+++ b/common/unicode-bidi.cpp
@@ -85,7 +85,7 @@ void UnicodeBiDiText::initWithU32String(const U32String &input) {
 		_log_to_vis_index = NULL;
 		_vis_to_log_index = NULL;
 	} else {
-		visual = U32String(visual_str, input.size());
+		visual = U32String((uint32 *)visual_str, input.size());
 		delete[] visual_str;
 	}
 #else