From patchwork Wed Nov 28 16:56:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Tulak X-Patchwork-Id: 10703007 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 715EA109C for ; Wed, 28 Nov 2018 16:57:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 61A102DB7D for ; Wed, 28 Nov 2018 16:57:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 567A32DBDD; Wed, 28 Nov 2018 16:57:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 147712DB7D for ; Wed, 28 Nov 2018 16:57:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729100AbeK2D7Z (ORCPT ); Wed, 28 Nov 2018 22:59:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37132 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729093AbeK2D7Y (ORCPT ); Wed, 28 Nov 2018 22:59:24 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1D2A0C04B2F6 for ; Wed, 28 Nov 2018 16:57:07 +0000 (UTC) Received: from honza-mbp.redhat.com (ovpn-204-210.brq.redhat.com [10.40.204.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 21EE561521; Wed, 28 Nov 2018 16:57:05 +0000 (UTC) From: Jan Tulak To: linux-xfs@vger.kernel.org Cc: sandeen@redhat.com, Jan Tulak Subject: [PATCH 3/4] common/types.h: Wrap #define UUID_STR_LEN 36 in #ifndef Date: Wed, 28 Nov 2018 17:56:48 +0100 Message-Id: <20181128165649.56853-4-jtulak@redhat.com> In-Reply-To: <20181128165649.56853-1-jtulak@redhat.com> References: <20181128165649.56853-1-jtulak@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 28 Nov 2018 16:57:07 +0000 (UTC) Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Current Fedora 28 has the constant it in uuid/uuid.h where it belongs (per comment next to the define), so we should treat the define as a backward-compatibility workaround, rather than enforcing it for all. Signed-off-by: Jan Tulak Reviewed-by: Eric Sandeen --- common/types.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/types.h b/common/types.h index 50c841e..096c5b7 100644 --- a/common/types.h +++ b/common/types.h @@ -35,7 +35,9 @@ /* * Should be, but isn't, defined in uuid/uuid.h */ +#ifndef UUID_STR_LEN #define UUID_STR_LEN 36 +#endif /* fundamental page size - probably should not be hardwired, but * for now we will