diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2006-02-21 11:28:01 +0300 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2006-02-21 11:28:01 +0300 |
| commit | f41c4c7ced3b4de503b49ff3d047d2dd7df7edf8 (patch) | |
| tree | ec5fe2cea7bb3222372bacfa1199ad28ebc13b85 | |
| parent | 99db626d210c747e8e8da2de09afb523547329bc (diff) | |
* include/ddk/ntifs,h (FILE_ID_FULL_DIRECTORY_INFORMATION): Revert
last change.
Remove file level #pragma pack(push,4)/#pragma pop.
| -rw-r--r-- | winsup/w32api/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/w32api/include/ddk/ntifs.h | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 730b52338..e3cadccab 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,9 @@ +2006-02-21 Danny Smith <dannysmith@users.sourceforge.net> + + * include/ddk/ntifs,h (FILE_ID_FULL_DIRECTORY_INFORMATION): Revert + last change. + Remove file level #pragma pack(push,4)/#pragma pop. + 2006-02-19 Corinna Vinschen <corinna@vinschen.de> * include/ddk/ntifs.h (FILE_ID_FULL_DIRECTORY_INFORMATION): Add filler diff --git a/winsup/w32api/include/ddk/ntifs.h b/winsup/w32api/include/ddk/ntifs.h index ae1ca94a4..87f50d9c7 100644 --- a/winsup/w32api/include/ddk/ntifs.h +++ b/winsup/w32api/include/ddk/ntifs.h @@ -35,8 +35,6 @@ extern "C" { #include "ntddk.h" #include "ntapi.h" -#pragma pack(push,4) - #define VER_PRODUCTBUILD 10000 #ifndef NTSYSAPI @@ -952,7 +950,6 @@ typedef struct _FILE_ID_FULL_DIRECTORY_INFORMATION { ULONG FileAttributes; ULONG FileNameLength; ULONG EaSize; - ULONG __filler; LARGE_INTEGER FileId; WCHAR FileName[0]; } FILE_ID_FULL_DIRECTORY_INFORMATION, *PFILE_ID_FULL_DIRECTORY_INFORMATION; @@ -4721,8 +4718,6 @@ ZwYieldExecution ( VOID ); -#pragma pack(pop) - #ifdef __cplusplus } #endif |