From 0ce2ca4e006a70d787481040fa844c85aac43222 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 12 Apr 2011 16:53:15 +0200
Subject: COMMON: Replace MKID_BE by MKTAG

MKID_BE relied on unspecified behavior of the C++ compiler,
and as such was always a bit unsafe. The new MKTAG macro
is slightly less elegant, but does no longer depend on the
behavior of the compiler.
Inspired by FFmpeg, which has an almost identical macro.
---
 graphics/sjis.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'graphics/sjis.cpp')

diff --git a/graphics/sjis.cpp b/graphics/sjis.cpp
index bb9f33aa26..c581f9b265 100644
--- a/graphics/sjis.cpp
+++ b/graphics/sjis.cpp
@@ -362,7 +362,7 @@ bool FontSjisSVM::loadData() {
 	uint32 magic1 = data->readUint32BE();
 	uint32 magic2 = data->readUint32BE();
 
-	if (magic1 != MKID_BE('SCVM') || magic2 != MKID_BE('SJIS')) {
+	if (magic1 != MKTAG('S','C','V','M') || magic2 != MKTAG('S','J','I','S')) {
 		delete data;
 		return false;
 	}
-- 
cgit v1.2.3