From 4b6ce33628fd942a18bc5e5053da61024c13a9c6 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 14 Feb 2010 14:49:44 +0000
Subject: Directly mark structs as WINE_PACKED where all members are marked as
 packed. This fixes a ton of gcc warnings about ignored packed attributes.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30581 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 loader/wine/mmreg.h    | 26 +++++++++++++-------------
 loader/wine/pe_image.h | 26 +++++++++++++-------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/loader/wine/mmreg.h b/loader/wine/mmreg.h
index 4ab6b7a2ff..2ed01a215e 100644
--- a/loader/wine/mmreg.h
+++ b/loader/wine/mmreg.h
@@ -89,19 +89,19 @@ typedef struct {
 
 #ifndef _MPEGLAYER3WAVEFORMAT_
 #define _MPEGLAYER3WAVEFORMAT_
-typedef struct mpeglayer3waveformat_tag {
-  WORD   wFormatTag WINE_PACKED;
-  WORD   nChannels WINE_PACKED;
-  DWORD  nSamplesPerSec WINE_PACKED;
-  DWORD  nAvgBytesPerSec WINE_PACKED;
-  WORD   nBlockAlign WINE_PACKED;
-  WORD   wBitsPerSample WINE_PACKED;
-  WORD   cbSize WINE_PACKED;
-  WORD          wID WINE_PACKED;
-  DWORD         fdwFlags WINE_PACKED;
-  WORD          nBlockSize WINE_PACKED;
-  WORD          nFramesPerBlock WINE_PACKED;
-  WORD          nCodecDelay WINE_PACKED;
+typedef struct WINE_PACKED mpeglayer3waveformat_tag {
+  WORD   wFormatTag;
+  WORD   nChannels;
+  DWORD  nSamplesPerSec;
+  DWORD  nAvgBytesPerSec;
+  WORD   nBlockAlign;
+  WORD   wBitsPerSample;
+  WORD   cbSize;
+  WORD   wID;
+  DWORD  fdwFlags;
+  WORD   nBlockSize;
+  WORD   nFramesPerBlock;
+  WORD   nCodecDelay;
 } MPEGLAYER3WAVEFORMAT;
 #endif /* !_MPEGLAYER3WAVEFORMAT_ */
 
diff --git a/loader/wine/pe_image.h b/loader/wine/pe_image.h
index 1c28bc12d0..aab6fd8cd3 100644
--- a/loader/wine/pe_image.h
+++ b/loader/wine/pe_image.h
@@ -54,19 +54,19 @@ PIMAGE_RESOURCE_DIRECTORY GetResDirEntryW(PIMAGE_RESOURCE_DIRECTORY, LPCWSTR, DW
 
 typedef DWORD CALLBACK (*DLLENTRYPROC)(HMODULE,DWORD,LPVOID);
 
-typedef struct {
-	WORD	popl	WINE_PACKED;	/* 0x8f 0x05 */
-	DWORD	addr_popped WINE_PACKED;/* ...  */
-	BYTE	pushl1	WINE_PACKED;	/* 0x68 */
-	DWORD	newret WINE_PACKED;	/* ...  */
-	BYTE	pushl2 	WINE_PACKED;	/* 0x68 */
-	DWORD	origfun WINE_PACKED;	/* original function */
-	BYTE	ret1	WINE_PACKED;	/* 0xc3 */
-	WORD	addesp 	WINE_PACKED;	/* 0x83 0xc4 */
-	BYTE	nrofargs WINE_PACKED;	/* nr of arguments to add esp, */
-	BYTE	pushl3	WINE_PACKED;	/* 0x68 */
-	DWORD	oldret	WINE_PACKED;	/* Filled out from popl above  */
-	BYTE	ret2	WINE_PACKED;	/* 0xc3 */
+typedef struct WINE_PACKED {
+	WORD	popl;		/* 0x8f 0x05 */
+	DWORD	addr_popped;	/* ...  */
+	BYTE	pushl1;		/* 0x68 */
+	DWORD	newret;		/* ...  */
+	BYTE	pushl2;		/* 0x68 */
+	DWORD	origfun;	/* original function */
+	BYTE	ret1;		/* 0xc3 */
+	WORD	addesp;		/* 0x83 0xc4 */
+	BYTE	nrofargs;	/* nr of arguments to add esp, */
+	BYTE	pushl3;		/* 0x68 */
+	DWORD	oldret;		/* Filled out from popl above  */
+	BYTE	ret2;		/* 0xc3 */
 } ELF_STDCALL_STUB;
 
 typedef struct {
-- 
cgit v1.2.3