diff options
| author | Bing-Hua Wang <binghuawang@ami.com> | 2020-11-13 13:35:25 +0800 |
|---|---|---|
| committer | Alexander Amelkin <mocbuhtig@amelkin.msk.ru> | 2021-04-08 11:29:25 +0300 |
| commit | 5a36080f9232f4dda665202a41039aa78aa67fac (patch) | |
| tree | c0b8d51e42570d909fc71a23fae7b23865b220c0 /include/ipmitool/ipmi_constants.h | |
| parent | 682fec09ef27e7fb418541f256ffbcb14a15dcc9 (diff) | |
| download | ipmitool-5a36080f9232f4dda665202a41039aa78aa67fac.tar.gz | |
Use "#pragma once" for headers
Some of the header guard names in ipmitool duplicated with the ones in
freeipmi.
* ipmitool/ipmi_fru.h and freeipmi/fru/ipmi-fru.h both uses IPMI_FRU_H
* ipmitool/ipmi_sdr.h and freeipmi/sdr/ipmi-sdr.h both uses IPMI_SDR_H
* ipmitool/ipmi_sel.h and freeipmi/sel/ipmi-sel.h both uses IPMI_SEL_H
This is problematic as including the 1st will prevent the 2nd from being
included, leading to the loss of any declarations, inline definitions,
or other "#includes" in the 2nd header.
For example, including ipmitool/ipmi_sel.h and freeipmi/freeipmi.h fails
to build.
$ cat test.c
#include <ipmitool/ipmi_sel.h>
#include <freeipmi/freeipmi.h>
$ gcc test.c -I${HOME}/src/oss/ipmitool/include
In file included from /usr/include/freeipmi/freeipmi.h:90,
from test.c:2:
/usr/include/freeipmi/sdr/oem/ipmi-sdr-oem-intel-node-manager.h:48:44: error: unknown type name 'ipmi_sdr_ctx_t'; did you mean 'ipmi_fru_ctx_t'?
48 | int ipmi_sdr_oem_parse_intel_node_manager (ipmi_sdr_ctx_t ctx,
| ^~~~~~~~~~~~~~
| ipmi_fru_ctx_t
Remove header guards and use "#pragma once" instead. In this way, we
don't have to do manual management to avoid name clashes.
* src/plugins/lan/md5.h is left as is being an external header
originally.
* src/plugins/imb/imbapi.h is a convoluted header consisting of multiple
header guards. Let's just add "#pragma once" and leave header guards
as is for now.
Signed-off-by: Bing-Hua Wang <binghuawang@ami.com>
Diffstat (limited to 'include/ipmitool/ipmi_constants.h')
| -rw-r--r-- | include/ipmitool/ipmi_constants.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/ipmitool/ipmi_constants.h b/include/ipmitool/ipmi_constants.h index fc8642d..1a91940 100644 --- a/include/ipmitool/ipmi_constants.h +++ b/include/ipmitool/ipmi_constants.h @@ -30,9 +30,7 @@ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -#ifndef IPMI_CONSTANTS_H -#define IPMI_CONSTANTS_H - +#pragma once /* * COMMANDS @@ -133,5 +131,3 @@ #define IPMI_CRYPT_AES_CBC_128 0x01 #define IPMI_CRYPT_XRC4_128 0x02 #define IPMI_CRYPT_XRC4_40 0x03 - -#endif /*IPMI_CONSTANTS_H*/ |