aboutsummaryrefslogtreecommitdiff
path: root/backends/midi
diff options
context:
space:
mode:
authorJohannes Schickel2009-05-13 17:33:58 +0000
committerJohannes Schickel2009-05-13 17:33:58 +0000
commitb9ac179b2e601f761cc60d431a3e5428f3740935 (patch)
tree7506eb36dfc431532e9f03a06d226c770d5c14dc /backends/midi
parenta866e90342b8797b8fa28fdbcca975daed3f5c05 (diff)
downloadscummvm-rg350-b9ac179b2e601f761cc60d431a3e5428f3740935.tar.gz
scummvm-rg350-b9ac179b2e601f761cc60d431a3e5428f3740935.tar.bz2
scummvm-rg350-b9ac179b2e601f761cc60d431a3e5428f3740935.zip
Silence another g++ 4.4 warning.
svn-id: r40527
Diffstat (limited to 'backends/midi')
-rw-r--r--backends/midi/timidity.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/backends/midi/timidity.cpp b/backends/midi/timidity.cpp
index 4e1ddb770a..ecb6dd7e8a 100644
--- a/backends/midi/timidity.cpp
+++ b/backends/midi/timidity.cpp
@@ -37,6 +37,7 @@
#if defined (UNIX)
#include "common/util.h"
+#include "common/endian.h"
#include "sound/musicplugin.h"
#include "sound/mpu401.h"
@@ -367,7 +368,7 @@ void MidiDriver_TIMIDITY::timidity_meta_seq(int p1, int p2, int p3) {
seqbuf[3] = 0x7f;
seqbuf[4] = p1;
seqbuf[5] = p2;
- *(short *)&seqbuf[6] = p3;
+ WRITE_UINT16(&seqbuf[6], p3);
timidity_write_data(seqbuf, sizeof(seqbuf));
}