summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--win/tclWinFCmd.c6
-rw-r--r--win/tclWinFile.c6
3 files changed, 6 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 68cb5a4..ba090ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
* tests/winFCmd.test: renamed 'win2000' and 'notWin2000' to
more appropriate constraint names.
* win/tclWinFile.c: updated comments to reflect 07-11 changes.
+ * win/tclWinFCmd.c: made ConvertFileNameFormat static again,
+ since no longer used in tclWinFile.c
2002-07-14 Don Porter <dgp@users.sourceforge.net>
diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c
index 35c241f..0387aeb 100644
--- a/win/tclWinFCmd.c
+++ b/win/tclWinFCmd.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclWinFCmd.c,v 1.30 2002/06/12 09:28:58 vincentdarley Exp $
+ * RCS: @(#) $Id: tclWinFCmd.c,v 1.31 2002/07/15 09:53:21 vincentdarley Exp $
*/
#include "tclWinInt.h"
@@ -90,7 +90,7 @@ typedef int (TraversalProc)(CONST TCHAR *srcPtr, CONST TCHAR *dstPtr,
*/
static void StatError(Tcl_Interp *interp, Tcl_Obj *fileName);
-int ConvertFileNameFormat(Tcl_Interp *interp,
+static int ConvertFileNameFormat(Tcl_Interp *interp,
int objIndex, Tcl_Obj *fileName, int longShort,
Tcl_Obj **attributePtrPtr);
static int DoCopyFile(CONST TCHAR *srcPtr, CONST TCHAR *dstPtr);
@@ -1466,7 +1466,7 @@ GetWinFileAttributes(
*----------------------------------------------------------------------
*/
-int
+static int
ConvertFileNameFormat(
Tcl_Interp *interp, /* The interp we are using for errors. */
int objIndex, /* The index of the attribute. */
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index be89053..a1f498b 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclWinFile.c,v 1.36 2002/07/15 09:01:51 vincentdarley Exp $
+ * RCS: @(#) $Id: tclWinFile.c,v 1.37 2002/07/15 09:53:21 vincentdarley Exp $
*/
//#define _WIN32_WINNT 0x0500
@@ -22,10 +22,6 @@
#include <shlobj.h>
#include <lmaccess.h> /* For TclpGetUserHome(). */
-extern int ConvertFileNameFormat(Tcl_Interp *interp,
- int objIndex, Tcl_Obj *fileName, int longShort,
- Tcl_Obj **attributePtrPtr);
-
/*
* Declarations for 'link' related information. This information
* should come with VC++ 6.0, but is not in some older SDKs.