From patchwork Wed Jul 29 18:37:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Heading X-Patchwork-Id: 6895771 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 199099F358 for ; Wed, 29 Jul 2015 18:37:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 29AA220651 for ; Wed, 29 Jul 2015 18:37:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3936C2064F for ; Wed, 29 Jul 2015 18:37:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751673AbbG2Shn (ORCPT ); Wed, 29 Jul 2015 14:37:43 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:37130 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751170AbbG2Shm (ORCPT ); Wed, 29 Jul 2015 14:37:42 -0400 Received: by wibud3 with SMTP id ud3so38260963wib.0 for ; Wed, 29 Jul 2015 11:37:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=jE2cqNoqD0bOCvWMPAR3/nGLZpWIc9+SbREM4DpIeoY=; b=U8KElWyCKrHEN9FfnY/rhckprnNqmfKYqN/Qk8ZYeyhhsvHLf3vc1uki4y/UK2wBH+ ssyhZEzvbolqagKOxelQ5uvlgdEcB47eLSdhXb5uRHOJgrEIy8SlnekQH360RWSx4j/f OfuTKZtuPOZ3s76+kcv+2i+/wSlPgHzOloEfPkuugbdrBKLWu28ysQW+7zm6swdO3qxD Um4K9N009dfufxMo19ePliE/+7XziLv58QNb3cjB1lHyIR6oWeB1Vfg6fSsXz3vO93Q9 vICSi5FwCX2XMf2uITzbbJC16aX6I1fRsNfyZPHrZArQyDKvtB4JCbXdkJ5t9ySHVBHe Cmhw== X-Received: by 10.180.72.35 with SMTP id a3mr8169259wiv.21.1438195061308; Wed, 29 Jul 2015 11:37:41 -0700 (PDT) Received: from bhfedora.localdomain ([82.15.84.251]) by smtp.gmail.com with ESMTPSA id uc3sm25704160wib.2.2015.07.29.11.37.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jul 2015 11:37:40 -0700 (PDT) From: Brendan Heading To: linux-btrfs@vger.kernel.org Cc: Brendan Heading Subject: [PATCH 1/1] btrfs-progs: compilation errors when using musl libc Date: Wed, 29 Jul 2015 19:37:37 +0100 Message-Id: <1438195057-9400-1-git-send-email-brendanheading@gmail.com> X-Mailer: git-send-email 2.4.3 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP - limits.h must be included to pick up PATH_MAX. - remove double declaration of BTRFS_DISABLE_BACKTRACE kerncompat.h assumed that if __GLIBC__ was not defined, it could safely define BTRFS_DISABLE_BACKTRACE, however this can be defined by the configure script. Added a check to ensure it is not defined first. Signed-off-by: Brendan Heading --- cmds-inspect.c | 1 + cmds-receive.c | 1 + cmds-scrub.c | 1 + cmds-send.c | 1 + kerncompat.h | 2 ++ 5 files changed, 6 insertions(+) diff --git a/cmds-inspect.c b/cmds-inspect.c index 71451fe..9712581 100644 --- a/cmds-inspect.c +++ b/cmds-inspect.c @@ -20,6 +20,7 @@ #include #include #include +#include #include "kerncompat.h" #include "ioctl.h" diff --git a/cmds-receive.c b/cmds-receive.c index 071bea9..d4b3103 100644 --- a/cmds-receive.c +++ b/cmds-receive.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include diff --git a/cmds-scrub.c b/cmds-scrub.c index b7aa809..5a85dc4 100644 --- a/cmds-scrub.c +++ b/cmds-scrub.c @@ -34,6 +34,7 @@ #include #include #include +#include #include "ctree.h" #include "ioctl.h" diff --git a/cmds-send.c b/cmds-send.c index 20bba18..a0b7f95 100644 --- a/cmds-send.c +++ b/cmds-send.c @@ -33,6 +33,7 @@ #include #include #include +#include #include "ctree.h" #include "ioctl.h" diff --git a/kerncompat.h b/kerncompat.h index 5d92856..7c627ba 100644 --- a/kerncompat.h +++ b/kerncompat.h @@ -33,7 +33,9 @@ #include #ifndef __GLIBC__ +#ifndef BTRFS_DISABLE_BACKTRACE #define BTRFS_DISABLE_BACKTRACE +#endif #define __always_inline __inline __attribute__ ((__always_inline__)) #endif