| Message ID | CABz95_A18aY0VkamhuoZ-ziAVf2mzs6vsCmxbUyVVxDet49++A@mail.gmail.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
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 -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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>
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(-)