From 6dd9ce45620382f3a06d1540ed2c08f4c88ad00a Mon Sep 17 00:00:00 2001 From: dkf Date: Mon, 10 Jan 2005 11:21:50 +0000 Subject: Convert u_int to unsigned to make clashes with types in standard C headers less of a problem. [Bug 1098829] --- ChangeLog | 6 ++++++ unix/tclUnixFCmd.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e4796c3..65efd31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-01-10 Donal K. Fellows + + * unix/tclUnixFCmd.c (CopyFile): Convert u_int to unsigned + to make clashes with types in standard C headers less of a + problem. [Bug 1098829] + 2005-01-06 Donal K. Fellows * library/http/http.tcl (http::mapReply): Significant performance diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c index 9d709e6..a96291f 100644 --- a/unix/tclUnixFCmd.c +++ b/unix/tclUnixFCmd.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclUnixFCmd.c,v 1.28.2.3 2004/11/11 01:15:29 das Exp $ + * RCS: @(#) $Id: tclUnixFCmd.c,v 1.28.2.4 2005/01/10 11:21:51 dkf Exp $ * * Portions of this code were derived from NetBSD source code which has * the following copyright notice: @@ -433,8 +433,8 @@ CopyFile(src, dst, statBufPtr) { int srcFd; int dstFd; - u_int blockSize; /* Optimal I/O blocksize for filesystem */ - char *buffer; /* Data buffer for copy */ + unsigned blockSize; /* Optimal I/O blocksize for filesystem */ + char *buffer; /* Data buffer for copy */ size_t nread; if ((srcFd = TclOSopen(src, O_RDONLY, 0)) < 0) { /* INTL: Native. */ -- cgit v0.12