From a707ec6200762c81eb748232f4cd3999c995dbc2 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Sat, 3 Jul 2010 13:18:05 +0000 Subject: [PATCH] Fix previous commit to properly check udev flag definition. git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@297 36d66b0a-2a48-0410-832c-cd162a569da5 --- lib/libdevmapper.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libdevmapper.c b/lib/libdevmapper.c index e2379ab..3d3c1a4 100644 --- a/lib/libdevmapper.c +++ b/lib/libdevmapper.c @@ -26,16 +26,16 @@ static int _dm_use_count = 0; static struct crypt_device *_context = NULL; /* Compatibility for old device-mapper without udev support */ -#ifndef HAVE_DECL_DM_UDEV_DISABLE_DISK_RULES_FLAG -#define CRYPT_TEMP_UDEV_FLAGS 0 -static int _dm_task_set_cookie(struct dm_task *dmt, uint32_t *cookie, uint16_t flags) { return 0; } -static int _dm_udev_wait(uint32_t cookie) { return 0; }; -#else +#if HAVE_DECL_DM_UDEV_DISABLE_DISK_RULES_FLAG #define CRYPT_TEMP_UDEV_FLAGS DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG | \ DM_UDEV_DISABLE_DISK_RULES_FLAG | \ DM_UDEV_DISABLE_OTHER_RULES_FLAG #define _dm_task_set_cookie dm_task_set_cookie #define _dm_udev_wait dm_udev_wait +#else +#define CRYPT_TEMP_UDEV_FLAGS 0 +static int _dm_task_set_cookie(struct dm_task *dmt, uint32_t *cookie, uint16_t flags) { return 0; } +static int _dm_udev_wait(uint32_t cookie) { return 0; }; #endif static int _dm_use_udev() -- 2.7.4