build-sys: include <uuid.h> rather than <uuid/uuid.h>

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 267e78e43788729dd5f823ce39266bcd5f246c70..5ddde900128f5073735096ef36a880b789d9aadb 100644 (file)
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -59,11 +59,7 @@
 #include "xalloc.h"
 
 #ifdef HAVE_LIBUUID
-# ifdef HAVE_UUID_UUID_H
-#  include <uuid/uuid.h>
-# else
-#  include <uuid.h>
-# endif
+# include <uuid.h>
 #endif
 
 #ifdef HAVE_LIBBLKID_INTERNAL

diff --git a/disk-utils/swaplabel.c b/disk-utils/swaplabel.c
index fbd8ae37d5fa2d4f6b8432c27d3bd07672c5361c..163d00a2ab0f18900e9de4b28d7188d0b6ba6eaf 100644 (file)
--- a/disk-utils/swaplabel.c
+++ b/disk-utils/swaplabel.c
@@ -22,11 +22,7 @@
 #include <getopt.h>
 
 #ifdef HAVE_LIBUUID
-# ifdef HAVE_UUID_UUID_H
-#  include <uuid/uuid.h>
-# else
-#  include <uuid.h>
-# endif
+# include <uuid.h>
 #endif
 
 #include "c.h"

diff --git a/shlibs/blkid/src/probe.c b/shlibs/blkid/src/probe.c
index 3429277436c753493e8bcb9f0552d9540609eee7..8b8982509553b55eae78c53a448f1f6af2e0348b 100644 (file)
--- a/shlibs/blkid/src/probe.c
+++ b/shlibs/blkid/src/probe.c
@@ -105,11 +105,7 @@
 #include <stdarg.h>
 
 #ifdef HAVE_LIBUUID
-# ifdef HAVE_UUID_UUID_H
-#  include <uuid/uuid.h>
-# else
-#  include <uuid.h>
-# endif
+# include <uuid.h>
 #endif
 
 #include "blkidP.h"