--------------------- PatchSet 3209 Date: 2001/10/19 21:56:48 Author: serassio Branch: cygwin Tag: (none) Log: Manually merged changes from HEAD after cvsmerge crash Members: src/unlinkd.c:1.3.28.1->1.3.28.2 src/auth/basic/helpers/PAM/.cvsignore:1.3->1.3.12.1 src/auth/basic/helpers/SMB/.cvsignore:1.3->1.3.12.1 src/auth/basic/helpers/YP/.cvsignore:1.3->1.3.12.1 src/auth/basic/helpers/multi-domain-NTLM/.cvsignore:1.3->1.3.12.1 src/auth/digest/.cvsignore:1.3->1.3.12.1 src/auth/digest/helpers/.cvsignore:1.3->1.3.12.1 src/auth/digest/helpers/password/.cvsignore:1.3->1.3.12.1 src/auth/ntlm/helpers/NTLMSSP/.cvsignore:1.3->1.3.12.1 src/auth/ntlm/helpers/NTLMSSP/smbval/.cvsignore:1.3->1.3.12.1 src/auth/ntlm/helpers/fakeauth/.cvsignore:1.3->1.3.12.1 src/auth/ntlm/helpers/no_check/.cvsignore:1.3->1.3.12.1 Index: squid/src/unlinkd.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/unlinkd.c,v retrieving revision 1.3.28.1 retrieving revision 1.3.28.2 diff -u -r1.3.28.1 -r1.3.28.2 --- squid/src/unlinkd.c 14 Mar 2001 22:17:34 -0000 1.3.28.1 +++ squid/src/unlinkd.c 19 Oct 2001 21:56:48 -0000 1.3.28.2 @@ -1,6 +1,6 @@ /* - * $Id: unlinkd.c,v 1.3.28.1 2001/03/14 22:17:34 rbcollins Exp $ + * $Id: unlinkd.c,v 1.3.28.2 2001/10/19 21:56:48 serassio Exp $ * * DEBUG: section 12 Unlink Daemon * AUTHOR: Duane Wessels @@ -159,7 +159,7 @@ unlinkdInit(void) { int x; - char *args[2]; + const char *args[2]; struct timeval slp; args[0] = "(unlinkd)"; args[1] = NULL;