# HG changeset patch
# User Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
# Date 1284309916 25200
# Node ID 3093ede7da7911d997adbb17946ab0328354aef8
# Parent  3bc10c0f9e6a01ee08b5c0453a129f4a59e1b31a
6984085 xlock build fails on snv_147: "life.c", line 444: identifier redeclared: kill

diff -r 3bc10c0f9e6a -r 3093ede7da79 open-src/app/xlock/sun-src/life.c
--- a/open-src/app/xlock/sun-src/life.c	Fri Sep 10 17:56:58 2010 -0700
+++ b/open-src/app/xlock/sun-src/life.c	Sun Sep 12 09:45:16 2010 -0700
@@ -15,7 +15,7 @@
  */
 
 /*
- * Copyright (c) 2008, 1994, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -441,7 +441,7 @@
 
 
 static void
-kill(loc)
+killcell(loc)
     unsigned char *loc;
 {
     lifestruct *lp = &lifes[screen];
@@ -620,7 +620,7 @@
 		break;
 	    case DEATH:
 		if (*(loc + 1) & RT) {
-		    kill(loc);
+		    killcell(loc);
 		    erasecell(win, row, col);
 		}
 		break;