Revision: 50714
http://brlcad.svn.sourceforge.net/brlcad/?rev=50714&view=rev
Author: brlcad
Date: 2012-05-27 14:54:36 +0000 (Sun, 27 May 2012)
Log Message:
-----------
rename kill to killit to avoid a shadow warning on mac 10.4 (reported by _fkr
via irc)
Modified Paths:
--------------
brlcad/trunk/src/gtools/g_diff.c
Modified: brlcad/trunk/src/gtools/g_diff.c
===================================================================
--- brlcad/trunk/src/gtools/g_diff.c 2012-05-27 13:23:10 UTC (rev 50713)
+++ brlcad/trunk/src/gtools/g_diff.c 2012-05-27 14:54:36 UTC (rev 50714)
@@ -176,7 +176,7 @@
int
compare_external(struct directory *dp1, struct directory *dp2)
{
- int kill = 0;
+ int killit = 0;
struct bu_external ext1, ext2;
if (db_get_external(&ext1, dp1, dbip1)) {
@@ -190,15 +190,15 @@
if (ext1.ext_nbytes != ext2.ext_nbytes) {
printf("Byte counts are different on %s (%ld != %ld)\n", dp1->d_namep,
(long int)ext1.ext_nbytes, (long int)ext2.ext_nbytes);
- kill = 1;
+ killit = 1;
}
if (memcmp((void *)ext1.ext_buf, (void *)ext2.ext_buf, ext1.ext_nbytes)) {
printf("Byte value(s) are different on %s (has no Tcl list
representation)\n", dp1->d_namep);
- kill = 1;
+ killit = 1;
}
- if (kill) {
+ if (killit) {
if (mode == HUMAN) {
printf("kill %s and import it from %s\n", dp1->d_namep,
dbip1->dbi_filename);
} else {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
