From 96a4928454fb7a8361a0b33940006ff491506f4d Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 10 Oct 2009 12:44:02 -0400
Subject: drop __BCC__ cruft from string code

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 libc/string/memchr.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'libc/string/memchr.c')

diff --git a/libc/string/memchr.c b/libc/string/memchr.c
index 438f4fa4a..99e13a2fc 100644
--- a/libc/string/memchr.c
+++ b/libc/string/memchr.c
@@ -17,23 +17,16 @@
 Wvoid *Wmemchr(const Wvoid *s, Wint c, size_t n)
 {
 	register const Wuchar *r = (const Wuchar *) s;
-#ifdef __BCC__
-	/* bcc can optimize the counter if it thinks it is a pointer... */
-	register const char *np = (const char *) n;
-#else
-# define np n
-#endif
 
-	while (np) {
+	while (n) {
 		if (*r == ((Wuchar)c)) {
 			return (Wvoid *) r;	/* silence the warning */
 		}
 		++r;
-		--np;
+		--n;
 	}
 
 	return NULL;
 }
-#undef np
 
 libc_hidden_def(Wmemchr)
-- 
cgit v1.2.3