summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarel Zak2009-05-18 15:59:55 +0200
committerKarel Zak2009-05-22 10:06:15 +0200
commit8c0dc0719d4765f50c77b22acf2812b6e0fe74df (patch)
treea592b3503ef8b329ec3a1548365aef7fea300274
parentbuild-sys: add UTIL_{SET,RESTORE}_FLAGS (diff)
downloadkernel-qcow2-util-linux-8c0dc0719d4765f50c77b22acf2812b6e0fe74df.tar.gz
kernel-qcow2-util-linux-8c0dc0719d4765f50c77b22acf2812b6e0fe74df.tar.xz
kernel-qcow2-util-linux-8c0dc0719d4765f50c77b22acf2812b6e0fe74df.zip
build-sys: fix headers in mkswap and libblkid
Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r--disk-utils/mkswap.c6
-rw-r--r--shlibs/blkid/src/probe.c9
2 files changed, 12 insertions, 3 deletions
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 4acc73b23..bb97210ec 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 38d42762f..b2b888d40 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"