* [PATCH] misc: fix build without magic.h
@ 2014-10-09 21:39 Steven Honeyman
2014-10-11 23:32 ` Theodore Ts'o
0 siblings, 1 reply; 2+ messages in thread
From: Steven Honeyman @ 2014-10-09 21:39 UTC (permalink / raw)
To: linux-ext4; +Cc: tytso
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: misc: fix build without magic.h
2014-10-09 21:39 [PATCH] misc: fix build without magic.h Steven Honeyman
@ 2014-10-11 23:32 ` Theodore Ts'o
0 siblings, 0 replies; 2+ messages in thread
From: Theodore Ts'o @ 2014-10-11 23:32 UTC (permalink / raw)
To: Steven Honeyman; +Cc: linux-ext4
On Thu, Oct 09, 2014 at 10:39:22PM +0100, Steven Honeyman wrote:
> 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>
Apologies, this was fixed in my tree earlier, but I had failed to push
this out to the public git tree. Fixed now.
- Ted
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-10-11 23:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-09 21:39 [PATCH] misc: fix build without magic.h Steven Honeyman
2014-10-11 23:32 ` Theodore Ts'o
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).