# HG changeset patch
# User David du Colombier <0intro@gmail.com>
# Date 1331060668 -3600
# Node ID 60634355f6d8d5929f72b083fccb3c67132ccff0
# Parent  a170d9d2280834790e621c1ed0ae350c450af3b3
cc: fix merge

R=nixiedev, quanstro
CC=nix-dev
http://codereview.appspot.com/5756058

Committer: Francisco J Ballesteros <nemo.mbox@gmail.com>

diff -r a170d9d22808 -r 60634355f6d8 sys/src/cmd/cc/macbody
--- a/sys/src/cmd/cc/macbody	Tue Mar 06 17:08:30 2012 +0100
+++ b/sys/src/cmd/cc/macbody	Tue Mar 06 20:04:28 2012 +0100
@@ -24,14 +24,6 @@
 	int c1;
 	char *cp;
 
-<<<<<<< local
-=======
-	c = getnsc();
-	if(!isalpha(c) && c != '_' && c < Runeself) {
-		unget(c);
-		return S;
-	}
->>>>>>> other
 	for(cp = symb;;) {
 		if(c >= Runeself) {
 			for(c1=0;;) {
@@ -46,11 +38,7 @@
 			if(cp <= symb+NSYMB-4)
 				*cp++ = c;
 		c = getc();
-<<<<<<< local
 		if(c >= Runeself || isalnum(c) || c == '_')
-=======
-		if(isalnum(c) || c == '_' || c >= Runeself)
->>>>>>> other
 			continue;
 		unget(c);
 		break;