[Scummvm-cvs-logs] CVS: scummvm sound.h,1.12,1.13
Mutwin Kraus
mutle at users.sourceforge.net
Sun Apr 7 11:47:27 CEST 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv11736/scummvm
Modified Files:
sound.h
Log Message:
Changed the name of OffsetTable to MP3OffsetTable, as OffsetTable is already defined in the Apple Headers
Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** sound.h 5 Apr 2002 04:35:41 -0000 1.12
--- sound.h 7 Apr 2002 18:46:50 -0000 1.13
***************
*** 18,21 ****
--- 18,24 ----
* Change Log:
* $Log$
+ * Revision 1.13 2002/04/07 18:46:50 mutle
+ * Changed the name of OffsetTable to MP3OffsetTable, as OffsetTable is already defined in the Apple Headers
+ *
* Revision 1.12 2002/04/05 04:35:41 ender
* Fix mp3_cd support
***************
*** 61,68 ****
*
*/
#include "gmidi.h" /* General Midi */
! struct OffsetTable { /* Compressed Sound (.SO3) */
int org_offset;
int new_offset;
--- 64,74 ----
*
*/
+
+ #ifndef SOUND_H
+ #define SOUND_H
#include "gmidi.h" /* General Midi */
! struct MP3OffsetTable { /* Compressed Sound (.SO3) */
int org_offset;
int new_offset;
***************
*** 658,659 ****
--- 664,666 ----
+ #endif
\ No newline at end of file
More information about the Scummvm-git-logs
mailing list