linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Steven Honeyman <stevenhoneyman@gmail.com>
To: linux-ext4@vger.kernel.org
Cc: tytso@mit.edu
Subject: [PATCH] misc: fix build without magic.h
Date: Thu, 9 Oct 2014 22:39:22 +0100	[thread overview]
Message-ID: <CABz95_A18aY0VkamhuoZ-ziAVf2mzs6vsCmxbUyVVxDet49++A@mail.gmail.com> (raw)

This prevents a failed build if magic.h doesn't exist, because type
magic_t will be unknown.

Fixes: d2e3c0dc60cd ("misc: if dlopen() is available, use it to load
the libmagic library")
Signed-off-by: Steven Honeyman <stevenhoneyman@gmail.com>
---
 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>

-- 
2.1.2

             reply	other threads:[~2014-10-09 21:39 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-09 21:39 Steven Honeyman [this message]
2014-10-11 23:32 ` misc: fix build without 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=CABz95_A18aY0VkamhuoZ-ziAVf2mzs6vsCmxbUyVVxDet49++A@mail.gmail.com \
    --to=stevenhoneyman@gmail.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).