Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/bin/csh Avoid gcc-5 conversion warning (|= expands to int)



details:   https://anonhg.NetBSD.org/src/rev/56653589c670
branches:  trunk
changeset: 344201:56653589c670
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Mar 16 22:25:05 2016 +0000

description:
Avoid gcc-5 conversion warning (|= expands to int)

diffstat:

 bin/csh/exec.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 6f9c5a17d765 -r 56653589c670 bin/csh/exec.c
--- a/bin/csh/exec.c    Wed Mar 16 21:41:25 2016 +0000
+++ b/bin/csh/exec.c    Wed Mar 16 22:25:05 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.29 2013/07/16 17:47:43 christos Exp $ */
+/* $NetBSD: exec.c,v 1.30 2016/03/16 22:25:05 christos Exp $ */
 
 /*-
  * Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)exec.c     8.3 (Berkeley) 5/23/95";
 #else
-__RCSID("$NetBSD: exec.c,v 1.29 2013/07/16 17:47:43 christos Exp $");
+__RCSID("$NetBSD: exec.c,v 1.30 2016/03/16 22:25:05 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -91,7 +91,8 @@
 
 #define hash(a, b) (((a) * HSHMUL + (b)) & HSHMASK)
 #define bit(h, b) ((h)[(b) >> 3] & 1 << ((b) & 7))     /* bit test */
-#define bis(h, b) ((h)[(b) >> 3] |= (unsigned char)(1 << ((b) & 7)))   /* bit set */
+#define bis(h, b) ((h)[(b) >> 3] = \
+    (unsigned char)((1 << ((b) & 7)) | (h)[(b) >> 3]))/* bit set */
 static int hits, misses;
 
 /* Dummy search path for just absolute search when no path */



Home | Main Index | Thread Index | Old Index