UBUNTU: ubuntu: ndiswrapper -- fix interaction between __packed and packed

diff --git a/ubuntu/ndiswrapper/pe_linker.h b/ubuntu/ndiswrapper/pe_linker.h
index d582cdb..e62bc3f 100644 (file)
--- 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 62a8e53..3ba5baf 100644 (file)
--- 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;