gptfdisk/trunk/util-linux-2.38.patch

   1 From 127e40dcc2d62ad693cb4e03e1182d0a227d85e1 Mon Sep 17 00:00:00 2001
   2 From: Evangelos Foutras <evangelos@foutrelis.com>
   3 Date: Sat, 16 Apr 2022 08:24:58 +0300
   4 Subject: [PATCH] Fix uuid/uuid.h detection with util-linux 2.38
   5
   6 util-linux commit 10f5f79485964ab52272ebe79c3b0047b1f84d82 changed the
   7 header guard in uuid/uuid.h from _UUID_UUID_H to _UL_LIBUUID_UUID_H as
   8 the former was too generic; fix guid.cc to also look for the new name.
   9 ---
  10  guid.cc | 2 +-
  11  1 file changed, 1 insertion(+), 1 deletion(-)
  12
  13 diff --git a/guid.cc b/guid.cc
  14 index 1e73ab7..d3e4fd5 100644
  15 --- a/guid.cc
  16 +++ b/guid.cc
  17 @@ -141,7 +141,7 @@ void GUIDData::Zero(void) {
  18  void GUIDData::Randomize(void) {
  19     int i, uuidGenerated = 0;
  20
  21 -#ifdef _UUID_UUID_H
  22 +#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H)
  23     uuid_generate(uuidData);
  24     ReverseBytes(&uuidData[0], 4);
  25     ReverseBytes(&uuidData[4], 2);