system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 18:37:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

include: Specify explicit alignment for __int64 types.

Browse source
This commit is contained in:
Alexandre Julliard 2009-11-21 14:23:22 +01:00
parent 36fad65338
commit 7f69436ea8
6 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dlls/msvcrt/msvcrt.h
View file

@ -64,8 +64,8 @@ typedef unsigned int MSVCRT__dev_t;
typedef int MSVCRT__off_t; typedef int MSVCRT__off_t;
typedef int MSVCRT_clock_t; typedef int MSVCRT_clock_t;
typedef int MSVCRT___time32_t; typedef int MSVCRT___time32_t;
typedef __int64 MSVCRT___time64_t; typedef __int64 DECLSPEC_ALIGN(8) MSVCRT___time64_t;
typedef __int64 MSVCRT_fpos_t; typedef __int64 DECLSPEC_ALIGN(8) MSVCRT_fpos_t;
typedef void (*__cdecl MSVCRT_terminate_handler)(void); typedef void (*__cdecl MSVCRT_terminate_handler)(void);
typedef void (*__cdecl MSVCRT_terminate_function)(void); typedef void (*__cdecl MSVCRT_terminate_function)(void);
@ -316,7 +316,7 @@ struct MSVCRT__finddata32i64_t {
MSVCRT___time32_t time_create; MSVCRT___time32_t time_create;
MSVCRT___time32_t time_access; MSVCRT___time32_t time_access;
MSVCRT___time32_t time_write; MSVCRT___time32_t time_write;
__int64 size; __int64 DECLSPEC_ALIGN(8) size;
char name[260]; char name[260];
}; };
@ -334,7 +334,7 @@ struct MSVCRT__finddata64_t {
MSVCRT___time64_t time_create; MSVCRT___time64_t time_create;
MSVCRT___time64_t time_access; MSVCRT___time64_t time_access;
MSVCRT___time64_t time_write; MSVCRT___time64_t time_write;
__int64 size; __int64 DECLSPEC_ALIGN(8) size;
char name[260]; char name[260];
}; };
@ -352,7 +352,7 @@ struct MSVCRT__wfinddata32i64_t {
MSVCRT___time32_t time_create; MSVCRT___time32_t time_create;
MSVCRT___time32_t time_access; MSVCRT___time32_t time_access;
MSVCRT___time32_t time_write; MSVCRT___time32_t time_write;
__int64 size; __int64 DECLSPEC_ALIGN(8) size;
MSVCRT_wchar_t name[260]; MSVCRT_wchar_t name[260];
}; };
@ -370,7 +370,7 @@ struct MSVCRT__wfinddata64_t {
MSVCRT___time64_t time_create; MSVCRT___time64_t time_create;
MSVCRT___time64_t time_access; MSVCRT___time64_t time_access;
MSVCRT___time64_t time_write; MSVCRT___time64_t time_write;
__int64 size; __int64 DECLSPEC_ALIGN(8) size;
MSVCRT_wchar_t name[260]; MSVCRT_wchar_t name[260];
}; };

12
include/msvcrt/crtdefs.h
View file

@ -80,6 +80,16 @@
# endif # endif
#endif #endif
#ifndef DECLSPEC_ALIGN
# if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(MIDL_PASS)
# define DECLSPEC_ALIGN(x) __declspec(align(x))
# elif defined(__GNUC__)
# define DECLSPEC_ALIGN(x) __attribute__((aligned(x)))
# else
# define DECLSPEC_ALIGN(x)
# endif
#endif
#ifndef _MSVCRT_LONG_DEFINED #ifndef _MSVCRT_LONG_DEFINED
#define _MSVCRT_LONG_DEFINED #define _MSVCRT_LONG_DEFINED
/* we need 32-bit longs even on 64-bit */ /* we need 32-bit longs even on 64-bit */
@ -129,7 +139,7 @@ typedef __msvcrt_long __time32_t;
#endif #endif
#ifndef _TIME64_T_DEFINED #ifndef _TIME64_T_DEFINED
typedef __int64 __time64_t; typedef __int64 DECLSPEC_ALIGN(8) __time64_t;
#define _TIME64_T_DEFINED #define _TIME64_T_DEFINED
#endif #endif

4
include/msvcrt/io.h
View file

@ -44,7 +44,7 @@ struct _finddatai64_t
time_t time_create; time_t time_create;
time_t time_access; time_t time_access;
time_t time_write; time_t time_write;
__int64 size; __int64 DECLSPEC_ALIGN(8) size;
char name[260]; char name[260];
}; };
#endif /* _FINDDATA_T_DEFINED */ #endif /* _FINDDATA_T_DEFINED */
@ -65,7 +65,7 @@ struct _wfinddatai64_t {
time_t time_create; time_t time_create;
time_t time_access; time_t time_access;
time_t time_write; time_t time_write;
__int64 size; __int64 DECLSPEC_ALIGN(8) size;
wchar_t name[260]; wchar_t name[260];
}; };
#endif /* _WFINDDATA_T_DEFINED */ #endif /* _WFINDDATA_T_DEFINED */

2
include/msvcrt/stdio.h
View file

@ -72,7 +72,7 @@ typedef struct _iobuf
#endif /* _FILE_DEFINED */ #endif /* _FILE_DEFINED */
#ifndef _FPOS_T_DEFINED #ifndef _FPOS_T_DEFINED
typedef __int64 fpos_t; typedef __int64 DECLSPEC_ALIGN(8) fpos_t;
#define _FPOS_T_DEFINED #define _FPOS_T_DEFINED
#endif #endif

2
include/msvcrt/wchar.h
View file

@ -111,7 +111,7 @@ struct _wfinddatai64_t {
time_t time_create; time_t time_create;
time_t time_access; time_t time_access;
time_t time_write; time_t time_write;
__int64 size; __int64 DECLSPEC_ALIGN(8) size;
wchar_t name[260]; wchar_t name[260];
}; };

2
include/ws2def.h
View file

@ -58,7 +58,7 @@ typedef struct _CSADDR_INFO {
typedef struct WS(sockaddr_storage) { typedef struct WS(sockaddr_storage) {
short ss_family; short ss_family;
char __ss_pad1[WS(_SS_PAD1SIZE)]; char __ss_pad1[WS(_SS_PAD1SIZE)];
__int64 __ss_align; __int64 DECLSPEC_ALIGN(8) __ss_align;
char __ss_pad2[WS(_SS_PAD2SIZE)]; char __ss_pad2[WS(_SS_PAD2SIZE)];
} SOCKADDR_STORAGE, *PSOCKADDR_STORAGE, *LPSOCKADDR_STORAGE; } SOCKADDR_STORAGE, *PSOCKADDR_STORAGE, *LPSOCKADDR_STORAGE;