From patchwork Thu Oct 9 21:39:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Honeyman X-Patchwork-Id: 398392 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 34A151400B2 for ; Fri, 10 Oct 2014 08:39:32 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757503AbaJIVjZ (ORCPT ); Thu, 9 Oct 2014 17:39:25 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:41228 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751524AbaJIVjY (ORCPT ); Thu, 9 Oct 2014 17:39:24 -0400 Received: by mail-wi0-f181.google.com with SMTP id hi2so275061wib.2 for ; Thu, 09 Oct 2014 14:39:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=IW22nmnK5QX7kJYz2TEjhMJFmG9Ta5/12npNTTtH6B8=; b=YdbncaUeJ3q+Pl9DlF4cs91RheBQ1VSc+emKnhl2vZ6SFtTnc5/0FA7YkgdXWXjvt0 DNB1yWmw7G0b8DS/PUh9AmJjrECKjsPSFeL9NL2zSEXzUKAH7ZbNp3o8/pHrg3IzTDdv gE9p6u2hPgw0O0bPAISobndZ9T+LbKkgKF64+h8CbKxL+jsqzEZIBw8C0NAhhRjgiNlM MGYGgv5wLi+HWKzN4LHwoHvDA4NQKCOyoS/lW9SZ72xrlLB8ZgwqXtCMPMHxH1yj4/td I14bFt5V8IFYL1CK1HpZVcAfyFibiMF+StA0LonS4nTsmf0ItKkoYzACBAEQ1xZ/mL9y ljsg== MIME-Version: 1.0 X-Received: by 10.194.89.67 with SMTP id bm3mr378530wjb.80.1412890762748; Thu, 09 Oct 2014 14:39:22 -0700 (PDT) Received: by 10.194.94.197 with HTTP; Thu, 9 Oct 2014 14:39:22 -0700 (PDT) Date: Thu, 9 Oct 2014 22:39:22 +0100 Message-ID: Subject: [PATCH] misc: fix build without magic.h From: Steven Honeyman To: linux-ext4@vger.kernel.org Cc: tytso@mit.edu Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org 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 --- 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