Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[build] Remove PACKED macro
Most of iPXE uses __attribute__((packed)) anyway, and PACKED conflicts
with an identically-named macro in the upstream EFI header files.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
  • Loading branch information
mcb30 committed May 29, 2010
1 parent eef46c2 commit 307b39c
Show file tree
Hide file tree
Showing 6 changed files with 70 additions and 74 deletions.
8 changes: 4 additions & 4 deletions src/arch/i386/include/pxe.h
Expand Up @@ -10,7 +10,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
/* Parameter block for pxenv_unknown() */
struct s_PXENV_UNKNOWN {
PXENV_STATUS_t Status; /**< PXE status code */
} PACKED;
} __attribute__ (( packed ));

typedef struct s_PXENV_UNKNOWN PXENV_UNKNOWN_t;

Expand Down Expand Up @@ -87,7 +87,7 @@ struct undi_rom_header {
UINT16_t PXEROMID;
/** Offset of the PCI ROM structure */
UINT16_t PCIRHeader;
} PACKED;
} __attribute__ (( packed ));

/** Signature for an expansion ROM */
#define ROM_SIGNATURE 0xaa55
Expand Down Expand Up @@ -121,7 +121,7 @@ struct undi_rom_id {
UINT16_t DataSize;
/** Minimum required code segment size */
UINT16_t CodeSize;
} PACKED;
} __attribute__ (( packed ));

/** Signature for an UNDI ROM ID structure */
#define UNDI_ROM_ID_SIGNATURE \
Expand All @@ -138,7 +138,7 @@ struct pcir_header {
uint16_t vendor_id;
/** PCI device ID */
uint16_t device_id;
} PACKED;
} __attribute__ (( packed ));

/** Signature for an UNDI ROM ID structure */
#define PCIR_SIGNATURE \
Expand Down

0 comments on commit 307b39c

Please sign in to comment.