diff options
| author | Andy Whitcroft <apw@canonical.com> | 2011-01-17 14:14:18 +0000 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-03-17 17:03:33 -0600 |
| commit | 0c97c098b9ba9779b7e0c5f2841ab8dba8d563b6 (patch) | |
| tree | 8a595b85f2078f155887c86c6603e8a69848985b /ubuntu | |
| parent | 0274ba38c83b140c28d54438f004547167ad6483 (diff) | |
UBUNTU: ubuntu: ndiswrapper -- fix interaction between __packed and packed
Diffstat (limited to 'ubuntu')
| -rw-r--r-- | ubuntu/ndiswrapper/pe_linker.h | 2 | ||||
| -rw-r--r-- | ubuntu/ndiswrapper/winnt_types.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ubuntu/ndiswrapper/pe_linker.h b/ubuntu/ndiswrapper/pe_linker.h index d582cdbb7c9..e62bc3fb0f1 100644 --- a/ubuntu/ndiswrapper/pe_linker.h +++ b/ubuntu/ndiswrapper/pe_linker.h @@ -691,7 +691,7 @@ typedef PIMAGE_THUNK_DATA64 PIMAGE_THUNK_DATA; /* Import module directory */ -typedef struct packed _IMAGE_IMPORT_DESCRIPTOR { +typedef struct __packed _IMAGE_IMPORT_DESCRIPTOR { union { DWORD Characteristics; /* 0 for terminating null * import descriptor */ diff --git a/ubuntu/ndiswrapper/winnt_types.h b/ubuntu/ndiswrapper/winnt_types.h index 62a8e53eb0f..3ba5bafbb49 100644 --- a/ubuntu/ndiswrapper/winnt_types.h +++ b/ubuntu/ndiswrapper/winnt_types.h @@ -138,7 +138,7 @@ #endif -#define packed __attribute__((packed)) +// #define packed __attribute__((packed)) #define no_warn_unused __attribute__((unused)) typedef u8 BOOLEAN; |