]> git.proxmox.com Git - mirror_edk2.git/commit - BaseTools/Source/C/Include/Common/BaseTypes.h
BaseTools: align ERROR/WARNING/RETURN macros with MdePkg versions
authorLeif Lindholm <leif.lindholm@linaro.org>
Tue, 5 Dec 2017 16:10:15 +0000 (16:10 +0000)
committerLeif Lindholm <leif.lindholm@linaro.org>
Fri, 8 Dec 2017 09:54:05 +0000 (09:54 +0000)
commit978779d7b50cc30cad64b79e24224efa3c6082dc
tree39bc8f65a38821a071f5eddcae8077e1556d0419
parent50255363cbf0555e0f09adfb327189bd7a4be9da
BaseTools: align ERROR/WARNING/RETURN macros with MdePkg versions

BaseTools' BaseTypes.h defined the ENCODE_ERROR macro as
 #define ENCODE_ERROR(a)              ((RETURN_STATUS)(MAX_BIT | (a)))
whereas MdePkg defines it as
 #define ENCODE_ERROR(StatusCode)     ((RETURN_STATUS)(MAX_BIT | (StatusCode)))

When building with GCC 6.3 (at least) the former triggers
"error: overflow in implicit constant conversion [-Werror=overflow]"
Resolve this by aligning it with the latter one.

This also requires aligning the BaseTools typedef of RETURN_STATUS with
the MdePkg one: INTN -> UINTN.

While at it, update adjacent ENCODE_WARNING and RETURN_ERROR as well.

Add an explicit initialization of *Alignment to 0 in GenFfs.c
GetAlignmentFromFile to get rid of a warning occuring with GCC after
this change (-Werror=maybe-uninitialized).

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Liming Gao <liming.gao@intel.com>
BaseTools/Source/C/GenFfs/GenFfs.c
BaseTools/Source/C/Include/Common/BaseTypes.h