From: Karel Zak <kzak@redhat.com>
Date: Mon, 18 May 2009 13:59:55 +0000 (+0200)
Subject: build-sys: fix headers in mkswap and libblkid
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c0dc0719d4765f50c77b22acf2812b6e0fe74df;p=util-linux

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 4acc73b2..bb97210e 100644
--- 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 38d42762..b2b888d4 100644
--- 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"