From: Artemiy Volkov <artemiyv@acm.org>
Date: Sat, 4 Oct 2014 17:22:52 +0000 (-0400)
Subject: misc: fix build on absence of magic.h
X-Git-Tag: v1.43-WIP-2015-05-18~160
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d50fd63369481a2037611b17d4f38e27d251d52e;p=thirdparty%2Fe2fsprogs.git

misc: fix build on absence of magic.h

If magic.h is not present, there will be unresolved references to the magic_t
type in plausible.c. Fix that by moving the protecting #ifdef directive.

Signed-off-by: Artemiy Volkov <artemiyv@acm.org>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/misc/plausible.c b/misc/plausible.c
index aea4fce74..00bc6e27c 100644
--- a/misc/plausible.c
+++ b/misc/plausible.c
@@ -36,12 +36,12 @@
 #include "nls-enable.h"
 #include "blkid/blkid.h"
 
+#ifdef HAVE_MAGIC_H
 static magic_t (*dl_magic_open)(int);
 static const char *(*dl_magic_file)(magic_t, const char *);
 static int (*dl_magic_load)(magic_t, const char *);
 static void (*dl_magic_close)(magic_t);
 
-#ifdef HAVE_MAGIC_H
 #ifdef HAVE_DLOPEN
 #include <dlfcn.h>