]> err.no Git - util-linux/commitdiff
disk-utils: fix libuuid usage in mkswap
authorMatthias Koenig <mkoenig@suse.de>
Mon, 7 May 2007 08:56:50 +0000 (10:56 +0200)
committerKarel Zak <kzak@redhat.com>
Wed, 16 May 2007 21:55:23 +0000 (23:55 +0200)
Fix libuuid usage in mkswap.

Signed-off-by: Matthias Koenig <mkoenig@suse.de>
disk-utils/mkswap.c

index 970641010324321b87249d5a961cc53c1a487435..8cafd8f67b36f8bca93b86ec844a6460c097bf88 100644 (file)
@@ -50,7 +50,7 @@
 #include "xstrncpy.h"
 #include "nls.h"
 
-#ifdef HAVE_UUID_UUID_H
+#ifdef HAVE_LIBUUID
 #include <uuid/uuid.h>
 #endif
 
@@ -240,7 +240,7 @@ write_uuid_and_label(char *uuid, char *volume_name) {
                        printf("LABEL=%s, ", h->volume_name);
                else
                        printf(_("no label, "));
-#ifdef HAVE_UUID_UUID_H
+#ifdef HAVE_LIBUUID
                if (uuid) {
                        char uuid_string[37];
                        uuid_unparse(uuid, uuid_string);
@@ -521,7 +521,7 @@ main(int argc, char ** argv) {
        char *pp;
        char *opt_label = NULL;
        char *uuid = NULL;
-#ifdef HAVE_UUID_UUID_H
+#ifdef HAVE_LIBUUID
        uuid_t uuid_dat;
 #endif
 
@@ -577,7 +577,7 @@ main(int argc, char ** argv) {
                        usage();
        }
 
-#ifdef HAVE_UUID_UUID_H
+#ifdef HAVE_LIBUUID
        uuid_generate(uuid_dat);
        uuid = uuid_dat;
 #endif