[Scummvm-cvs-logs] CVS: scummvm scumm.h,1.27,1.28 scummsys.h,1.13,1.14 sound.cpp,1.7,1.8

[Ludvig Strigeus]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv6169

Modified Files:
	scumm.h scummsys.h sound.cpp 
Log Message:
gcc patch by lionel ulmer

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** scumm.h	2001/11/14 18:37:38	1.27
--- scumm.h	2001/11/14 19:33:10	1.28
***************
*** 38,47 ****
  };
  
- #pragma START_PACK_STRUCTS
- 	
  struct Point {
  	int x,y;
  };
  
  #define SIZEOF_BOX 20
  struct Box { /* file format */
--- 38,48 ----
  };
  
  struct Point {
  	int x,y;
  };
  
+ 
+ #pragma START_PACK_STRUCTS
+ 	
  #define SIZEOF_BOX 20
  struct Box { /* file format */
***************
*** 53,61 ****
  	byte flags;
  	uint16 scale;
! };
  
  struct ResHeader {
  	uint32 size;
! };
  
  struct RoomHeader {
--- 54,62 ----
  	byte flags;
  	uint16 scale;
! } GCC_PACK;
  
  struct ResHeader {
  	uint32 size;
! } GCC_PACK;
  
  struct RoomHeader {
***************
*** 63,67 ****
  	uint16 width,height;
  	uint16 numObjects;
! };
  
  struct BompHeader {
--- 64,68 ----
  	uint16 width,height;
  	uint16 numObjects;
! } GCC_PACK;
  
  struct BompHeader {
***************
*** 69,73 ****
  	uint16 unk;
  	uint16 width,height;
! };
  
  struct CodeHeader {
--- 70,74 ----
  	uint16 unk;
  	uint16 width,height;
! } GCC_PACK;
  
  struct CodeHeader {
***************
*** 95,99 ****
  		} v6;
  	};
! };
  
  struct ImageHeader { /* file format */
--- 96,100 ----
  		} v6;
  	};
! } GCC_PACK;
  
  struct ImageHeader { /* file format */
***************
*** 108,112 ****
  		int16 x,y;
  	} hotspot[15];
! };
  
  #pragma END_PACK_STRUCTS
--- 109,113 ----
  		int16 x,y;
  	} hotspot[15];
! } GCC_PACK;
  
  #pragma END_PACK_STRUCTS

Index: scummsys.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummsys.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** scummsys.h	2001/11/12 09:44:09	1.13
--- scummsys.h	2001/11/14 19:33:10	1.14
***************
*** 50,53 ****
--- 50,54 ----
  #define START_PACK_STRUCTS pack (push,1)
  #define END_PACK_STRUCTS   pack(pop)
+ #define GCC_PACK
  
  #elif defined(__CYGWIN__)
***************
*** 92,100 ****
  
  #define FORCEINLINE inline
- 
- #if defined(__GNUC__)
- #define NORETURN __attribute__((__noreturn__)) 
- #else
- #endif
  #define CDECL 
  
--- 93,96 ----
***************
*** 108,113 ****
--- 104,118 ----
  typedef signed long int32;
  
+ #if defined(__GNUC__)
+ #define START_PACK_STRUCTS
+ #define END_PACK_STRUCTS
+ #define GCC_PACK __attribute__((packed))
+ #define NORETURN __attribute__((__noreturn__)) 
+ #else
  #define START_PACK_STRUCTS pack (1)
  #define END_PACK_STRUCTS   pack ()
+ #define GCC_PACK
+ #define NORETURN
+ #endif
  
  #else

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** sound.cpp	2001/11/14 18:37:38	1.7
--- sound.cpp	2001/11/14 19:33:10	1.8
***************
*** 306,313 ****
  }
  
  struct VOCHeader {
  	byte id[19];
  	byte extra[7];
! };
  
  static const char VALID_VOC_ID[] = "Creative Voice File";
--- 306,315 ----
  }
  
+ #pragma START_PACK_STRUCTS
  struct VOCHeader {
  	byte id[19];
  	byte extra[7];
! } GCC_PACK;
! #pragma END_PACK_STRUCTS 
  
  static const char VALID_VOC_ID[] = "Creative Voice File";