Changeset 21700 for branches

Timestamp:

Oct 7, 2011, 12:57:25 AM (14 years ago)

Author:

dmik

Message:

Fix incorrect WINE_PACKED usage (compiler warning).

File:

• branches/gcc-kmk/include/win/pe_image.h (modified) (2 diffs)

branches/gcc-kmk/include/win/pe_image.h

@@ -32 +32 @@
 extern HGLOBAL PE_LoadResource(struct _wine_modref *wm,HRSRC);
 extern HMODULE PE_LoadImage( HFILE hFile, OFSTRUCT *ofs, LPCSTR *modName );
-extern struct _wine_modref *PE_CreateModule( HMODULE hModule, OFSTRUCT *ofs, 
+extern struct _wine_modref *PE_CreateModule( HMODULE hModule, OFSTRUCT *ofs,
                                              DWORD flags, BOOL builtin );
-extern BOOL PE_CreateProcess( HFILE hFile, OFSTRUCT *ofs, LPCSTR cmd_line, LPCSTR env, 
+extern BOOL PE_CreateProcess( HFILE hFile, OFSTRUCT *ofs, LPCSTR cmd_line, LPCSTR env,
                               LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
                               BOOL inherit, LPSTARTUPINFOA startup,
@@ -48 +48 @@
 
 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 */
-} ELF_STDCALL_STUB;
+        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 */
+} WINE_PACKED ELF_STDCALL_STUB;
 
 typedef struct {