From: Karel Zak <kzak@redhat.com>
Date: Wed, 16 Mar 2011 16:04:21 +0000 (+0100)
Subject: build-sys: include <uuid.h> rather than <uuid/uuid.h>
X-Git-Tag: v2.20-rc1~439
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ee96990c0a0ec691871c2adce082d6411345bb5;p=thirdparty%2Futil-linux.git

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 267e78e437..5ddde90012 100644
--- 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 fbd8ae37d5..163d00a2ab 100644
--- 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 3429277436..8b89825095 100644
--- 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"