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

zeldin marcus at mc.pp.se
Mon Jun 1 17:48:26 UTC 2020


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:
a37a33c008 DC: Fix a compilation warning


Commit: a37a33c0084b7dbd352bcda24999f17ee2b86209
    https://github.com/scummvm/scummvm/commit/a37a33c0084b7dbd352bcda24999f17ee2b86209
Author: Marcus Comstedt (marcus at mc.pp.se)
Date: 2020-06-01T19:47:31+02:00

Commit Message:
DC: Fix a compilation warning

Changed paths:
    backends/platform/dc/dcmain.cpp


diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp
index 81bd4db41b..1138ccb56b 100644
--- a/backends/platform/dc/dcmain.cpp
+++ b/backends/platform/dc/dcmain.cpp
@@ -31,6 +31,7 @@
 #include "DCLauncherDialog.h"
 #include <common/config-manager.h>
 #include <common/memstream.h>
+#include <common/endian.h>
 
 #include "audio/mixer_intern.h"
 
@@ -298,8 +299,8 @@ namespace DC_Flash {
       if(!(bm[(b>>3)&63] & (0x80>>(b&7)))) {
 	if((r = syscall_read_flash(info[0] + ((b+1) << 6), buf, 64))<0)
 	  return r;
-	else if((s=*(unsigned short *)(buf+0)) == sec &&
-		flash_crc(buf, 62) == *(unsigned short *)(buf+62)) {
+	else if((s=READ_LE_UINT16(buf+0)) == sec &&
+		flash_crc(buf, 62) == READ_LE_UINT16(buf+62)) {
 	  memcpy(dst+(s-sec)*60, buf+2, 60);
 	  got=1;
 	}




More information about the Scummvm-git-logs mailing list