From patchwork Tue Aug 13 19:04:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Terekhov, Mikhail via Gdb-patches" X-Patchwork-Id: 34074 Received: (qmail 111896 invoked by alias); 13 Aug 2019 19:04:42 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 111887 invoked by uid 89); 13 Aug 2019 19:04:42 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=H*MI:google, online X-HELO: mail-qt1-f201.google.com Received: from mail-qt1-f201.google.com (HELO mail-qt1-f201.google.com) (209.85.160.201) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 13 Aug 2019 19:04:41 +0000 Received: by mail-qt1-f201.google.com with SMTP id z15so10313424qtq.6 for ; Tue, 13 Aug 2019 12:04:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=E/5zZkeB4dQItQyIkTSefqd5ER1QZomiqi8ZpNqHurI=; b=lUKYa/hDqjAMeSHh/DT/aEv3Cnu/2wLSfrVrn8awM1B+Bh/jsImF52Lp766YwZEHQk qR+CC38613E/pGI1A+zKe9aCcPEIMBvHZv8SuIMzDQJ/uG5aUms4k5Ff9jNkgDXsIW54 WaeOZgaSUkNgHA9/s+Xxfxh+4YKVPKKpjJblCt+SMZ32wPRwapR4z6WOfXMBAEidFJ63 bbyjZXgZXyHryafKYO8hvYxV52f7KWMIYMOpfKci4rBJt2anCnHqJwN0yQHvfdciS2cE 8LqRUNvRHZ32V6nRTTT09XFltzLhM0CicZJN704NRuJXqvQlNNkQ/Lp3VCuDLro0beJm sU6Q== Date: Tue, 13 Aug 2019 14:04:36 -0500 Message-Id: <20190813190436.215693-1-cbiesinger@google.com> Mime-Version: 1.0 Subject: [PATCH] [readline] Fix compilation on MinGW X-Patchwork-Original-From: "Christian Biesinger via gdb-patches" From: "Terekhov, Mikhail via Gdb-patches" Reply-To: Christian Biesinger To: gdb-patches@sourceware.org Cc: Christian Biesinger X-IsSubscribed: yes S_ISLNK should not be called outside of an #ifdef. However, this specific call is actually unnecessary, because linkok can only be 0 if S_ISLNK is true, per the code above. I have sent a bug report to bug-readline, though it does not show up in the online archive yet. 2019-08-13 Christian Biesinger * colors.c (_rl_print_color_indicator): Remove unnecessary S_ISLNK check to fix compilation on MinGW. --- readline/ChangeLog.gdb | 5 +++++ readline/colors.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/readline/ChangeLog.gdb b/readline/ChangeLog.gdb index 982ef7b710..01b083951e 100644 --- a/readline/ChangeLog.gdb +++ b/readline/ChangeLog.gdb @@ -1,3 +1,8 @@ +2019-08-13 Christian Biesinger + + * colors.c (_rl_print_color_indicator): Remove unnecessary + S_ISLNK check to fix compilation on MinGW. + 2019-08-12 Tom Tromey * Imported readline 8.0. diff --git a/readline/colors.c b/readline/colors.c index 53758e0e77..81aecfe0c8 100644 --- a/readline/colors.c +++ b/readline/colors.c @@ -175,7 +175,7 @@ _rl_print_color_indicator (const char *f) if (linkok == -1 && _rl_color_indicator[C_MISSING].string != NULL) colored_filetype = C_MISSING; - else if (linkok == 0 && S_ISLNK(mode) && _rl_color_indicator[C_ORPHAN].string != NULL) + else if (linkok == 0 && _rl_color_indicator[C_ORPHAN].string != NULL) colored_filetype = C_ORPHAN; /* dangling symlink */ else if(stat_ok != 0) {