[Scummvm-cvs-logs] CVS: scummvm/backends/midi/mt32 structures.h,1.9,1.10

Eugene Sandulenko sev at users.sourceforge.net
Sun Nov 14 03:47:07 CET 2004


Update of /cvsroot/scummvm/scummvm/backends/midi/mt32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30621

Modified Files:
	structures.h 
Log Message:
Make #pragma pack really multiplatform. Old code didn't work on
non-Win32 platforms.


Index: structures.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/mt32/structures.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- structures.h	14 Nov 2004 04:40:12 -0000	1.9
+++ structures.h	14 Nov 2004 11:46:29 -0000	1.10
@@ -47,7 +47,7 @@
 // Since sysex allows this memory to be written to in blocks of bytes,
 // we keep this packed so that we can copy data into the various
 // banks directly
-#ifdef __GNUC__
+#if defined(_MSC_VER) || defined (__MINGW32__)
 #pragma pack(push, 1)
 #else
 #pragma pack(1)
@@ -180,7 +180,7 @@
 	MemBanks banks;
 } MT32EMU_ALIGN_PACKED;
 
-#ifdef __GNUC__
+#if defined(_MSC_VER) || defined (__MINGW32__)
 #pragma pack(pop)
 #else
 #pragma pack()





More information about the Scummvm-git-logs mailing list