CVS: winex/include dbghelp.h,1.2,1.3

Subject: winex/include dbghelp.h,1.2,1.3Update of /var/lib/cvsd/cvsroot/winex/include
In directory agravaine:/tmp/cvs-serv18878/include

Modified Files:
	dbghelp.h 
Log Message:

- fixed a few compiler warnings in the PDB file dumper
- fixed some alignment issues in some of the dbghelp structs.  Windows apps expected some members to be at different offsets than gcc was generating
- added the WINE_ALIGN() macro to align single members of structs


Index: dbghelp.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/dbghelp.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dbghelp.h	30 Aug 2007 14:15:26 -0000	1.2
+++ dbghelp.h	30 Aug 2007 14:17:24 -0000	1.3
@@ -21,6 +21,9 @@
 #ifndef __WINE_DBGHELP_H
 #define __WINE_DBGHELP_H
 
+# include "wine/compiler_defines.h"
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
@@ -811,7 +814,6 @@
 
 #define MAX_SYM_NAME    2000
 
-#include <pshpack8.h>
 typedef struct _SYMBOL_INFO
 {
     ULONG       SizeOfStruct;
@@ -821,7 +823,7 @@
     ULONG       Size;
     ULONG64     ModBase;
     ULONG       Flags;
-    ULONG64     Value;
+    ULONG64     Value   WINE_ALIGN(8);
     ULONG64     Address;
     ULONG       Register;
     ULONG       Scope;
@@ -840,7 +842,7 @@
     ULONG       Size;
     ULONG64     ModBase;
     ULONG       Flags;
-    ULONG64     Value;
+    ULONG64     Value   WINE_ALIGN(8);
     ULONG64     Address;
     ULONG       Register;
     ULONG       Scope;
@@ -849,7 +851,6 @@
     ULONG       MaxNameLen;
     WCHAR       Name[1];
 } SYMBOL_INFOW, *PSYMBOL_INFOW;
-#include <poppack.h>
 
 typedef enum _IMAGEHLP_SYMBOL_TYPE_INFO 
 {
@@ -1099,7 +1100,7 @@
     ADDRESS64   AddrStack;
     ADDRESS64   AddrBStore;
     PVOID       FuncTableEntry;
-    DWORD64     Params[4];
+    DWORD64     Params[4]   WINE_ALIGN(8);
     BOOL        Far;
     BOOL        Virtual;
     DWORD64     Reserved[3];