From tcl repository:

        2003-10-22  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
        * generic/tclCmdAH.c (Tcl_FileObjCmd): Changed FILE_ prefix to FCMD_
        to stop symbol/#def clashes on Cygwin/Mingw32 on NT.

diff --git a/tcl/ChangeLog b/tcl/ChangeLog
index e005e11..c8dc753 100644 (file)
--- a/tcl/ChangeLog
+++ b/tcl/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-21  Keith Seitz  <kseitz@uglyboxes.com>
+
+       From tcl repository:
+       2003-10-22  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
+       * generic/tclCmdAH.c (Tcl_FileObjCmd): Changed FILE_ prefix to FCMD_
+       to stop symbol/#def clashes on Cygwin/Mingw32 on NT.
+
 2003-02-11  Martin M. Hunt  <hunt@redhat.com>
        From Mumit Khan  <khan@nanotech.wisc.edu>
 

diff --git a/tcl/generic/tclCmdAH.c b/tcl/generic/tclCmdAH.c
index e82dee2..80b8c7a 100644 (file)
--- a/tcl/generic/tclCmdAH.c
+++ b/tcl/generic/tclCmdAH.c
@@ -801,16 +801,16 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
        (char *) NULL
     };
     enum options {
-       FILE_ATIME,     FILE_ATTRIBUTES, FILE_CHANNELS, FILE_COPY,
-       FILE_DELETE,
-       FILE_DIRNAME,   FILE_EXECUTABLE, FILE_EXISTS,   FILE_EXTENSION,
-       FILE_ISDIRECTORY, FILE_ISFILE,  FILE_JOIN,      FILE_LINK, 
-       FILE_LSTAT,     FILE_MTIME,     FILE_MKDIR,     FILE_NATIVENAME, 
-       FILE_NORMALIZE, FILE_OWNED,
-       FILE_PATHTYPE,  FILE_READABLE,  FILE_READLINK,  FILE_RENAME,
-       FILE_ROOTNAME,  FILE_SEPARATOR, FILE_SIZE,      FILE_SPLIT,     
-       FILE_STAT,      FILE_SYSTEM, 
-       FILE_TAIL,      FILE_TYPE,      FILE_VOLUMES,   FILE_WRITABLE
+       FCMD_ATIME,     FCMD_ATTRIBUTES, FCMD_CHANNELS, FCMD_COPY,
+       FCMD_DELETE,
+       FCMD_DIRNAME,   FCMD_EXECUTABLE, FCMD_EXISTS,   FCMD_EXTENSION,
+       FCMD_ISDIRECTORY, FCMD_ISFILE,  FCMD_JOIN,      FCMD_LINK, 
+       FCMD_LSTAT,     FCMD_MTIME,     FCMD_MKDIR,     FCMD_NATIVENAME, 
+       FCMD_NORMALIZE, FCMD_OWNED,
+       FCMD_PATHTYPE,  FCMD_READABLE,  FCMD_READLINK,  FCMD_RENAME,
+       FCMD_ROOTNAME,  FCMD_SEPARATOR, FCMD_SIZE,      FCMD_SPLIT,     
+       FCMD_STAT,      FCMD_SYSTEM, 
+       FCMD_TAIL,      FCMD_TYPE,      FCMD_VOLUMES,   FCMD_WRITABLE
     };
 
     if (objc < 2) {
@@ -823,7 +823,7 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
     }
 
     switch ((enum options) index) {
-       case FILE_ATIME: {
+       case FCMD_ATIME: {
            Tcl_StatBuf buf;
            struct utimbuf tval;
 
@@ -861,10 +861,10 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
            Tcl_SetLongObj(Tcl_GetObjResult(interp), (long) buf.st_atime);
            return TCL_OK;
        }
-       case FILE_ATTRIBUTES: {
+       case FCMD_ATTRIBUTES: {
             return TclFileAttrsCmd(interp, objc, objv);
        }
-       case FILE_CHANNELS: {
+       case FCMD_CHANNELS: {
            if ((objc < 2) || (objc > 3)) {
                Tcl_WrongNumArgs(interp, 2, objv, "?pattern?");
                return TCL_ERROR;
@@ -872,13 +872,13 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
            return Tcl_GetChannelNamesEx(interp,
                    ((objc == 2) ? NULL : Tcl_GetString(objv[2])));
        }
-       case FILE_COPY: {
+       case FCMD_COPY: {
            return TclFileCopyCmd(interp, objc, objv);
        }           
-       case FILE_DELETE: {
+       case FCMD_DELETE: {
            return TclFileDeleteCmd(interp, objc, objv);
        }
-       case FILE_DIRNAME: {
+       case FCMD_DIRNAME: {
            Tcl_Obj *dirPtr;
            if (objc != 3) {
                goto only3Args;
@@ -892,19 +892,19 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
                return TCL_OK;
            }
        }
-       case FILE_EXECUTABLE: {
+       case FCMD_EXECUTABLE: {
            if (objc != 3) {
                goto only3Args;
            }
            return CheckAccess(interp, objv[2], X_OK);
        }
-       case FILE_EXISTS: {
+       case FCMD_EXISTS: {
            if (objc != 3) {
                goto only3Args;
            }
            return CheckAccess(interp, objv[2], F_OK);
        }
-       case FILE_EXTENSION: {
+       case FCMD_EXTENSION: {
            char *fileName, *extension;
            if (objc != 3) {
                goto only3Args;
@@ -916,7 +916,7 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
            }
            return TCL_OK;
        }
-       case FILE_ISDIRECTORY: {
+       case FCMD_ISDIRECTORY: {
            int value;
            Tcl_StatBuf buf;
 
@@ -930,7 +930,7 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
            Tcl_SetBooleanObj(Tcl_GetObjResult(interp), value);
            return TCL_OK;
        }
-       case FILE_ISFILE: {
+       case FCMD_ISFILE: {
            int value;
            Tcl_StatBuf buf;
            
@@ -944,7 +944,7 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
            Tcl_SetBooleanObj(Tcl_GetObjResult(interp), value);
            return TCL_OK;
        }
-       case FILE_JOIN: {
+       case FCMD_JOIN: {
            Tcl_Obj *resObj;
 
            if (objc < 3) {
@@ -955,7 +955,7 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
            Tcl_SetObjResult(interp, resObj);
            return TCL_OK;
        }
-       case FILE_LINK: {
+       case FCMD_LINK: {
            Tcl_Obj *contents;
            int index;
            
@@ -1045,7 +1045,7 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
            }
            return TCL_OK;
        }
-       case FILE_LSTAT: {
+       case FCMD_LSTAT: {
            char *varName;
            Tcl_StatBuf buf;
 
@@ -1059,7 +1059,7 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
            varName = Tcl_GetString(objv[3]);
            return StoreStatData(interp, varName, &buf);
        }
-       case FILE_MTIME: {
+       case FCMD_MTIME: {
            Tcl_StatBuf buf;
            struct utimbuf tval;
 
@@ -1097,14 +1097,14 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
            Tcl_SetLongObj(Tcl_GetObjResult(interp), (long) buf.st_mtime);
            return TCL_OK;
        }
-       case FILE_MKDIR: {
+       case FCMD_MKDIR: {
            if (objc < 3) {
                Tcl_WrongNumArgs(interp, 2, objv, "name ?name ...?");
                return TCL_ERROR;
            }
            return TclFileMakeDirsCmd(interp, objc, objv);
        }
-       case FILE_NATIVENAME: {
+       case FCMD_NATIVENAME: {
            CONST char *fileName;
            Tcl_DString ds;
 
@@ -1121,7 +1121,7 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
            Tcl_DStringFree(&ds);
            return TCL_OK;
        }
-       case FILE_NORMALIZE: {
+       case FCMD_NORMALIZE: {
            Tcl_Obj *fileName;
 
            if (objc != 3) {
@@ -1133,7 +1133,7 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
            Tcl_SetObjResult(interp, fileName);
            return TCL_OK;
        }
-       case FILE_OWNED: {
+       case FCMD_OWNED: {
            int value;
            Tcl_StatBuf buf;
            
@@ -1156,7 +1156,7 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
            Tcl_SetBooleanObj(Tcl_GetObjResult(interp), value);
            return TCL_OK;
        }
-       case FILE_PATHTYPE: {
+       case FCMD_PATHTYPE: {
            if (objc != 3) {
                goto only3Args;
            }
@@ -1174,13 +1174,13 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
            }
            return TCL_OK;
        }
-       case FILE_READABLE: {
+       case FCMD_READABLE: {
            if (objc != 3) {
                goto only3Args;
            }
            return CheckAccess(interp, objv[2], R_OK);
        }
-       case FILE_READLINK: {
+       case FCMD_READLINK: {
            Tcl_Obj *contents;
                
            if (objc != 3) {
@@ -1203,10 +1203,10 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
            Tcl_DecrRefCount(contents);
            return TCL_OK;
        }
-       case FILE_RENAME: {
+       case FCMD_RENAME: {
            return TclFileRenameCmd(interp, objc, objv);
        }
-       case FILE_ROOTNAME: {
+       case FCMD_ROOTNAME: {
            int length;
            char *fileName, *extension;
            
@@ -1223,7 +1223,7 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
            }
            return TCL_OK;
        }
-       case FILE_SEPARATOR: {
+       case FCMD_SEPARATOR: {
            if ((objc < 2) || (objc > 3)) {
                Tcl_WrongNumArgs(interp, 2, objv, "?name?");
                return TCL_ERROR;
@@ -1254,7 +1254,7 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
            }
            return TCL_OK;
        }
-       case FILE_SIZE: {
+       case FCMD_SIZE: {
            Tcl_StatBuf buf;
            
            if (objc != 3) {
@@ -1267,14 +1267,14 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
                    (Tcl_WideInt) buf.st_size);
            return TCL_OK;
        }
-       case FILE_SPLIT: {
+       case FCMD_SPLIT: {
            if (objc != 3) {
                goto only3Args;
            }
            Tcl_SetObjResult(interp, Tcl_FSSplitPath(objv[2], NULL));
            return TCL_OK;
        }
-       case FILE_STAT: {
+       case FCMD_STAT: {
            char *varName;
            Tcl_StatBuf buf;
            
@@ -1288,7 +1288,7 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
            varName = Tcl_GetString(objv[3]);
            return StoreStatData(interp, varName, &buf);
        }
-       case FILE_SYSTEM: {
+       case FCMD_SYSTEM: {
            Tcl_Obj* fsInfo;
            if (objc != 3) {
                goto only3Args;
@@ -1303,7 +1303,7 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
                return TCL_ERROR;
            }
        }
-       case FILE_TAIL: {
+       case FCMD_TAIL: {
            int splitElements;
            Tcl_Obj *splitPtr;
 
@@ -1344,7 +1344,7 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
            Tcl_DecrRefCount(splitPtr);
            return TCL_OK;
        }
-       case FILE_TYPE: {
+       case FCMD_TYPE: {
            Tcl_StatBuf buf;
 
            if (objc != 3) {
@@ -1357,7 +1357,7 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
                    GetTypeFromMode((unsigned short) buf.st_mode), -1);
            return TCL_OK;
        }
-       case FILE_VOLUMES: {
+       case FCMD_VOLUMES: {
            if (objc != 2) {
                Tcl_WrongNumArgs(interp, 2, objv, NULL);
                return TCL_ERROR;
@@ -1365,7 +1365,7 @@ Tcl_FileObjCmd(dummy, interp, objc, objv)
            Tcl_SetObjResult(interp, Tcl_FSListVolumes());
            return TCL_OK;
        }
-       case FILE_WRITABLE: {
+       case FCMD_WRITABLE: {
            if (objc != 3) {
                goto only3Args;
            }