build-sys: fix headers in mkswap and libblkid

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

diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 4acc73b2305b47097f444cec026525a855e0d5cf..bb97210ec955c6797a291e5bc15c1568341c4108 100644 (file)
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -57,7 +57,11 @@
 #include "wholedisk.h"
 
 #ifdef HAVE_LIBUUID
-#include <uuid/uuid.h>
+# ifdef HAVE_UUID_UUID_H
+#  include <uuid/uuid.h>
+#else
+# include <uuid.h>
+# endif
 #endif
 
 static char * program_name = "mkswap";

diff --git a/shlibs/blkid/src/probe.c b/shlibs/blkid/src/probe.c
index 38d42762f2726da784def72fdd000712be8721fe..b2b888d40655e3a6f68203061b1817660e68783d 100644 (file)
--- a/shlibs/blkid/src/probe.c
+++ b/shlibs/blkid/src/probe.c
@@ -24,10 +24,15 @@
 #include <errno.h>
 #endif
 #include <stdint.h>
+#include <stdarg.h>
+
 #ifdef HAVE_LIBUUID
-#include <uuid/uuid.h>
+# ifdef HAVE_UUID_UUID_H
+#  include <uuid/uuid.h>
+#else
+# include <uuid.h>
+# endif
 #endif
-#include <stdarg.h>
 
 #include "blkdev.h"
 #include "blkidP.h"