Re: [Gptfdisk-general] [PATCH] Fix uuid/uuid.h detection with util-linux 2.38

[Rod S. <rod...@ro...>]

On 4/16/22 01:44, Evangelos Foutras via Gptfdisk-general wrote:
> util-linux commit 10f5f79485964ab52272ebe79c3b0047b1f84d82 changed the
> header guard in uuid/uuid.h from _UUID_UUID_H to _UL_LIBUUID_UUID_H as
> the former was too generic; fix guid.cc to also look for the new name.

Thanks for the patch. I've made this change to the current git version
of GPT fdisk.

> ---
>  guid.cc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/guid.cc b/guid.cc
> index 1e73ab7..d3e4fd5 100644
> --- a/guid.cc
> +++ b/guid.cc
> @@ -141,7 +141,7 @@ void GUIDData::Zero(void) {
>  void GUIDData::Randomize(void) {
>     int i, uuidGenerated = 0;
>  
> -#ifdef _UUID_UUID_H
> +#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H)
>     uuid_generate(uuidData);
>     ReverseBytes(&uuidData[0], 4);
>     ReverseBytes(&uuidData[4], 2);
> 
> 
> _______________________________________________
> Gptfdisk-general mailing list
> Gpt...@li...
> https://lists.sourceforge.net/lists/listinfo/gptfdisk-general


-- 
Rod Smith
rod...@ro...
http://www.rodsbooks.com