sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2026-02-14 02:31:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

[build] Prevent the use of reserved words in C23

Browse Source 
GCC 15 defaults to C23, which reserves bool, true, and false as
keywords.  Avoid using these as parameter or variable names.

Modified-by: Michael Brown <mcb30@ipxe.org>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Miao Wang
2025-04-27 17:30:49 +01:00
committed by Michael Brown
parent b816b816ab
commit 7741756afc
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/drivers/infiniband/mlx_utils/src/public/mlx_pci_gw.c
View File

@@ -32,7 +32,7 @@ mlx_status
mlx_pci_gw_check_capability_id( mlx_pci_gw_check_capability_id(
IN mlx_utils *utils, IN mlx_utils *utils,
IN mlx_uint8 cap_pointer, IN mlx_uint8 cap_pointer,
OUT mlx_boolean *bool OUT mlx_boolean *result
) )
{ {
mlx_status status = MLX_SUCCESS; mlx_status status = MLX_SUCCESS;
@@ -41,7 +41,7 @@ mlx_pci_gw_check_capability_id(
status = mlx_pci_read(utils, MlxPciWidthUint8, offset, status = mlx_pci_read(utils, MlxPciWidthUint8, offset,
1, &id); 1, &id);
MLX_CHECK_STATUS(utils, status, read_err,"failed to read capability id"); MLX_CHECK_STATUS(utils, status, read_err,"failed to read capability id");
*bool = ( id == PCI_GW_CAPABILITY_ID ); *result = ( id == PCI_GW_CAPABILITY_ID );
read_err: read_err:
return status; return status;
} }

7
src/drivers/net/igbvf/igbvf_osdep.h
View File

@@ -35,8 +35,9 @@ FILE_LICENCE ( GPL2_ONLY );
#ifndef _IGBVF_OSDEP_H_ #ifndef _IGBVF_OSDEP_H_
#define _IGBVF_OSDEP_H_ #define _IGBVF_OSDEP_H_
#include <stdbool.h>
#define u8 unsigned char #define u8 unsigned char
#define bool boolean_t
#define dma_addr_t unsigned long #define dma_addr_t unsigned long
#define __le16 uint16_t #define __le16 uint16_t
#define __le32 uint32_t #define __le32 uint32_t
@@ -51,10 +52,6 @@ FILE_LICENCE ( GPL2_ONLY );
#define ETH_FCS_LEN 4 #define ETH_FCS_LEN 4
typedef int spinlock_t; typedef int spinlock_t;
typedef enum {
false = 0,
true = 1
} boolean_t;
#define usec_delay(x) udelay(x) #define usec_delay(x) udelay(x)
#define msec_delay(x) mdelay(x) #define msec_delay(x) mdelay(x)

12
src/interface/efi/efi_hii.c
View File

@@ -147,13 +147,13 @@ void efi_ifr_end_op ( struct efi_ifr_builder *ifr ) {
*/ */
void efi_ifr_false_op ( struct efi_ifr_builder *ifr ) { void efi_ifr_false_op ( struct efi_ifr_builder *ifr ) {
size_t dispaddr = ifr->ops_len; size_t dispaddr = ifr->ops_len;
EFI_IFR_FALSE *false; EFI_IFR_FALSE *op;
/* Add opcode */ /* Add opcode */
false = efi_ifr_op ( ifr, EFI_IFR_FALSE_OP, sizeof ( *false ) ); op = efi_ifr_op ( ifr, EFI_IFR_FALSE_OP, sizeof ( *op ) );
DBGC ( ifr, "IFR %p false\n", ifr ); DBGC ( ifr, "IFR %p false\n", ifr );
DBGC2_HDA ( ifr, dispaddr, false, sizeof ( *false ) ); DBGC2_HDA ( ifr, dispaddr, op, sizeof ( *op ) );
} }
/** /**
@@ -462,13 +462,13 @@ void efi_ifr_text_op ( struct efi_ifr_builder *ifr, unsigned int prompt_id,
*/ */
void efi_ifr_true_op ( struct efi_ifr_builder *ifr ) { void efi_ifr_true_op ( struct efi_ifr_builder *ifr ) {
size_t dispaddr = ifr->ops_len; size_t dispaddr = ifr->ops_len;
EFI_IFR_TRUE *true; EFI_IFR_TRUE *op;
/* Add opcode */ /* Add opcode */
true = efi_ifr_op ( ifr, EFI_IFR_TRUE_OP, sizeof ( *true ) ); op = efi_ifr_op ( ifr, EFI_IFR_TRUE_OP, sizeof ( *op ) );
DBGC ( ifr, "IFR %p true\n", ifr ); DBGC ( ifr, "IFR %p true\n", ifr );
DBGC2_HDA ( ifr, dispaddr, true, sizeof ( *true ) ); DBGC2_HDA ( ifr, dispaddr, op, sizeof ( *op ) );
} }
/** /**