From patchwork Fri Mar 29 13:24:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: guy fleury iteriteka X-Patchwork-Id: 1586 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 849B916DB5; Fri, 29 Mar 2019 13:24:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, HTML_MESSAGE,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 420DF16DB3 for ; Fri, 29 Mar 2019 13:24:08 +0000 (GMT) Received: from localhost ([127.0.0.1]:52910 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9rUM-00070p-5x for patchwork@mira.cbaines.net; Fri, 29 Mar 2019 09:24:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46590) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9rUJ-00070i-OK for guix-patches@gnu.org; Fri, 29 Mar 2019 09:24:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h9rUI-00044A-R6 for guix-patches@gnu.org; Fri, 29 Mar 2019 09:24:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49793) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h9rUI-00043m-LM for guix-patches@gnu.org; Fri, 29 Mar 2019 09:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h9rUI-0000FS-Du for guix-patches@gnu.org; Fri, 29 Mar 2019 09:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35040] [PATCH]: Fix compilation warning Resent-From: Guy fleury Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Mar 2019 13:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35040 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1553865826930 (code B ref -1); Fri, 29 Mar 2019 13:24:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Mar 2019 13:23:46 +0000 Received: from localhost ([127.0.0.1]:35104 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h9rU2-0000Ew-4T for submit@debbugs.gnu.org; Fri, 29 Mar 2019 09:23:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60368) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h9rTz-0000Eh-Vf for submit@debbugs.gnu.org; Fri, 29 Mar 2019 09:23:44 -0400 Received: from lists.gnu.org ([209.51.188.17]:35203) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h9rTu-0003nN-2N for submit@debbugs.gnu.org; Fri, 29 Mar 2019 09:23:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46501) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9rTs-0006xi-Ug for Guix-patches@gnu.org; Fri, 29 Mar 2019 09:23:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h9rTr-0003mP-0I for Guix-patches@gnu.org; Fri, 29 Mar 2019 09:23:36 -0400 Received: from mail-oi1-x230.google.com ([2607:f8b0:4864:20::230]:37894) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h9rTn-0003l4-Op for Guix-patches@gnu.org; Fri, 29 Mar 2019 09:23:33 -0400 Received: by mail-oi1-x230.google.com with SMTP id w137so1626621oiw.5 for ; Fri, 29 Mar 2019 06:23:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=Wz5rbUad2kRg3O76iGGEfZBwAU+fTxX0PmAlxFqdaGo=; b=DcLYjhFjXdu2xo2g2i+Hih0rEbBRj5UMPAmQNPWMS9DUTFxdd7M2Hr4U/Yz9Cpqav0 lSv8FsMFT0YN7M26NKy2dU1DmnxCvwJRg8kENQuFov9Cdk9vuqjqkcwseA25tHZopQC0 /YZ2hmM/ez24ajVgl0yZ94YB17cb86i6JjzpyEVItA0hduuBM+RJR0qiW34kBw3tZJTj 29g83JqdYQiq6uMJz2OoSJFsoDLTV7UcVH1a2XEUGglNqbQ2AF4uMOZwSn4WruBincyp NPKVx2h6og1jaRg550Upi/6ULrqvVlI9IysbQ/YAzn2uWcrDg0bPbw8xXvfVQZX5zOSt O2PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=Wz5rbUad2kRg3O76iGGEfZBwAU+fTxX0PmAlxFqdaGo=; b=Yb0w06TcKjB0hj3tpKWoaBSqW8T/e0KmpVR37zIfijNM0zkZaj84ZVa+PoHCu/G9M1 wRkO/FPa/YO0LT6AgsOoAV7zN5wLKL+5EhZ53b55BSf7pN6BB4UpxMw1hM5TfA3PUIyG lzmd0SxcMLA2L14qJKeGdOr9n9GT4y3dYykKzmNxJEvfg3t7YGXLOgX86jw+Uqte9OtJ pkHPtpa1v/O4EQcdmQLAeQ7LbiwbtGcRRXuqlhZSTKNKZGCAB08GuEoNxIehyp0ybl5/ wJQJqzMRCfHZC8WA5EGOed3cdPO+ctguupdV83ccjVkcotIKEcHuo/FueHP5PJmqfOxS 4hhA== X-Gm-Message-State: APjAAAXDmEcqy3xfCES7ing2fy0fM3tUUd4eD7t+6blWCv4v1S8zbRY8 N4O3Uo7F2au7KuniZmutqBHgQFxjp/bN+JiZVNv1LA== X-Google-Smtp-Source: APXvYqzAqwIpY5TbCwtDANWPa/fXYdOYyqS98aKrdjUNlei7pW88HN6mYf2Hv9f2v96rG/nV6MrrV3WVgmCq6jE/tcs= X-Received: by 2002:aca:502:: with SMTP id 2mr3741843oif.38.1553865808480; Fri, 29 Mar 2019 06:23:28 -0700 (PDT) MIME-Version: 1.0 From: Guy fleury Date: Fri, 29 Mar 2019 14:24:03 +0100 Message-ID: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches hi guix, this patch fix compilation warning of libstore.a i don't know this is a right way to do that.i 'm not yet a good ;) From c20c3dbda40bfa9998ea0dd5396fda3951107d22 Mon Sep 17 00:00:00 2001 From: guy fleury iteriteka Date: Fri, 29 Mar 2019 13:59:21 +0100 Subject: [PATCH] Fix compilation warning * Use undef preprocessor to disable some macro defined in sys/mount.h and redefined in linux/fs.h. --- nix/libstore/local-store.cc | 38 +++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/nix/libstore/local-store.cc b/nix/libstore/local-store.cc index 892d930..bf38d8e 100644 --- a/nix/libstore/local-store.cc +++ b/nix/libstore/local-store.cc @@ -29,6 +29,44 @@ #endif #if HAVE_LINUX_FS_H + +#undef BLKRASET +#undef BLOCK_SIZE +#undef MS_RDONLY +#undef MS_NOSUID +#undef MS_NODEV +#undef MS_NOEXEC +#undef MS_SYNCHRONOUS +#undef MS_REMOUNT +#undef MS_MANDLOCK +#undef MS_DIRSYNC +#undef MS_NOATIME +#undef MS_NODIRATIME +#undef MS_BIND +#undef MS_MOVE +#undef MS_REC +#undef MS_SILENT +#undef MS_POSIXACL +#undef MS_UNBINDABLE +#undef MS_PRIVATE +#undef MS_SLAVE +#undef MS_SHARED +#undef MS_RELATIME +#undef MS_KERNMOUNT +#undef MS_I_VERSION +#undef MS_STRICTATIME +#undef MS_LAZYTIME +#undef MS_ACTIVE +#undef MS_NOUSER +#undef MS_RMT_MASK +#undef MS_MGC_VAL +#undef BLKROSET +#undef BLKROGET +#undef BLKRRPART +#undef BLKGETSIZE +#undef BLKFLSBUF +#undef BLKRAGET + #include #include #include -- 2.20.1