Merge with FreeBSD revision 1.21 (kientzle):
authorChris Pressey <cpressey@dragonflybsd.org>
Fri, 31 Dec 2004 22:31:18 +0000 (22:31 +0000)
committerChris Pressey <cpressey@dragonflybsd.org>
Fri, 31 Dec 2004 22:31:18 +0000 (22:31 +0000)
commit6251e7b5a6cb01ba94d858c245b9e30a441a1baf
tree2eb33824917ff678ede058141bbdea0104b892e2
parentd094eee86635d6132dd13b9adc7095f62147c472
Merge with FreeBSD revision 1.21 (kientzle):

"Rename logf --> chat_logf  to avoid naming conflicts
 with GCC built-in (and with C90 reserved library name).

 Approved by: gordon (Mentor)"
usr.bin/chat/chat.c