[Scummvm-cvs-logs] CVS: scummvm/scumm resource_v7he.h,1.5,1.6

Max Horn fingolfin at users.sourceforge.net
Sun Jun 27 06:16:18 CEST 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24865

Modified Files:
	resource_v7he.h 
Log Message:
Use existing ScummVM functionality for packed structs

Index: resource_v7he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v7he.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- resource_v7he.h	27 Jun 2004 11:21:54 -0000	1.5
+++ resource_v7he.h	27 Jun 2004 13:15:23 -0000	1.6
@@ -134,10 +134,9 @@
  * Structures 
  */
 
-#if !defined (WIN32)
-#define PACKED __attribute__ ((packed))
-#endif
-#pragma pack(1) 
+#if !defined(__GNUC__)
+	#pragma START_PACK_STRUCTS
+#endif	
 
 	struct WinLibrary {
 		File *file;
@@ -184,7 +183,7 @@
 		uint16 reserved;
 		uint16 type;
 		uint16 count;
-		Win32CursorIconDirEntry entries[1] PACKED;
+		Win32CursorIconDirEntry entries[1] GCC_PACK;
 	};
 
 	struct Win32CursorIconFileDirEntry {
@@ -419,7 +418,9 @@
 		uint16 number_of_id_entries;
 	};
 
-#pragma pack()
+#if !defined(__GNUC__)
+	#pragma END_PACK_STRUCTS
+#endif
 
 /*
  * Function Prototypes





More information about the Scummvm-git-logs mailing list