From: Artemiy Volkov <artemiyv@acm.org>
To: tytso@mit.edu
Cc: linux-ext4@vger.kernel.org, darrick.wong@oracle.com,
Artemiy Volkov <artemiyv@acm.org>
Subject: [PATCH] misc: fix build on absence of magic.h
Date: Fri, 3 Oct 2014 21:58:38 +1000 [thread overview]
Message-ID: <1412337518-2250-1-git-send-email-artemiyv@acm.org> (raw)
In-Reply-To: <1411277306-29807-1-git-send-email-tytso@mit.edu>
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>
---
misc/plausible.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/misc/plausible.c b/misc/plausible.c
index aea4fce..00bc6e2 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>
--
1.9.1
next prev parent reply other threads:[~2014-10-03 11:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-21 5:28 [PATCH] misc: if dlopen() is available, use it to load the libmagic library Theodore Ts'o
2014-10-03 11:58 ` Artemiy Volkov [this message]
2014-10-04 17:24 ` [PATCH] misc: fix build on absence of magic.h Theodore Ts'o
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1412337518-2250-1-git-send-email-artemiyv@acm.org \
--to=artemiyv@acm.org \
--cc=darrick.wong@oracle.com \
--cc=linux-ext4@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).