Module Name: src
Committed By: christos
Date: Wed Mar 16 22:25:05 UTC 2016
Modified Files:
src/bin/csh: exec.c
Log Message:
Avoid gcc-5 conversion warning (|= expands to int)
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/bin/csh/exec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/csh/exec.c
diff -u src/bin/csh/exec.c:1.29 src/bin/csh/exec.c:1.30
--- src/bin/csh/exec.c:1.29 Tue Jul 16 13:47:43 2013
+++ src/bin/csh/exec.c Wed Mar 16 18:25:05 2016
@@ -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 @@ static unsigned char xhash[HSHSIZ / 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 */
