aboutsummaryrefslogtreecommitdiff
path: root/main.cpp
diff options
context:
space:
mode:
authorLionel Ulmer2002-05-04 09:55:10 +0000
committerLionel Ulmer2002-05-04 09:55:10 +0000
commitab0401242e07ace58025c8a4a9f660690b55d144 (patch)
treed3bd0721d4b4e1af0c2560eed907f52f56d3b79d /main.cpp
parent6979311c0acfd8a90a53264a09ade0310b928e85 (diff)
downloadscummvm-rg350-ab0401242e07ace58025c8a4a9f660690b55d144.tar.gz
scummvm-rg350-ab0401242e07ace58025c8a4a9f660690b55d144.tar.bz2
scummvm-rg350-ab0401242e07ace58025c8a4a9f660690b55d144.zip
Change the 'poperty' call to be 64-bits clean.
Porters, please check that I did not break anything while updating your ports. Thanks :-) svn-id: r4196
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/main.cpp b/main.cpp
index 1f729e8ab7..8f42da5908 100644
--- a/main.cpp
+++ b/main.cpp
@@ -81,7 +81,7 @@ static void do_memory_test(void) {
signal(SIGBUS, handle_errors);
signal(SIGABRT, handle_errors);
signal(SIGSEGV, handle_errors);
- if (*((int *) ((char *) test + 1)) != value) {
+ if (*((unsigned int *) ((char *) test + 1)) != value) {
error("Your system does not support unaligned memory accesses. Please rebuild with SCUMM_NEED_ALIGNMENT ");
}
signal(SIGBUS, SIG_DFL);
@@ -148,7 +148,10 @@ int main(int argc, char *argv[])
{
char *s = detector.getGameName();
- system->property(OSystem::PROP_SET_WINDOW_CAPTION, (long)s);
+ OSystem::Property prop;
+
+ prop.caption = s;
+ system->property(OSystem::PROP_SET_WINDOW_CAPTION, &prop);
free(s);
}