6984085 xlock build fails on snv_147: "life.c", line 444: identifier redeclared: kill
--- 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;