From 2d59677cd079d9ecd994b875aceb5e960fb652c6 Mon Sep 17 00:00:00 2001 From: dkf Date: Mon, 10 Jan 2005 11:16:42 +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 bacf355..4a91f3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-01-10 Donal K. Fellows + + * unix/tclUnixFCmd.c (TclUnixCopyFile): Convert u_int to unsigned + to make clashes with types in standard C headers less of a + problem. [Bug 1098829] + 2005-01-09 Joe English * unix/tclUnixThrd.c, unix/tclUnixPort.h: Remove readdir_r() diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c index f0f852e..56eb9f7 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.40 2004/11/11 01:14:41 das Exp $ + * RCS: @(#) $Id: tclUnixFCmd.c,v 1.41 2005/01/10 11:16:44 dkf Exp $ * * Portions of this code were derived from NetBSD source code which has * the following copyright notice: @@ -477,8 +477,8 @@ TclUnixCopyFile(src, dst, statBufPtr, dontCopyAtts) { 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; #ifdef DJGPP -- cgit v0.12