diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2003-09-29 22:38:20 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2003-09-29 22:38:20 (GMT) |
| commit | a87c1ffef9b5c696cd26cd041002325c871cafde (patch) | |
| tree | 6c781c25d5131eac1c137fe66c3d7c56d62d6d38 /win | |
| parent | c6d77be71d20d811ddf04702ae5fd428aa7e0b47 (diff) | |
| download | tcl-a87c1ffef9b5c696cd26cd041002325c871cafde.zip tcl-a87c1ffef9b5c696cd26cd041002325c871cafde.tar.gz tcl-a87c1ffef9b5c696cd26cd041002325c871cafde.tar.bz2 | |
Symbols which are visible outside a single compilation unit must have
the prefix 'Tcl' to keep them out of the way of non-Tcl C code on Unix.
(Problem reported by George Staplin.)
Diffstat (limited to 'win')
| -rw-r--r-- | win/tclWin32Dll.c | 8 | ||||
| -rw-r--r-- | win/tclWinFile.c | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c index 1d6266b..09b9046 100644 --- a/win/tclWin32Dll.c +++ b/win/tclWin32Dll.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: tclWin32Dll.c,v 1.26 2003/06/23 10:14:02 vincentdarley Exp $ + * RCS: @(#) $Id: tclWin32Dll.c,v 1.27 2003/09/29 22:38:21 dkf Exp $ */ #include "tclWinInt.h" @@ -181,7 +181,7 @@ MountPointMap *driveLetterLookup = NULL; TCL_DECLARE_MUTEX(mountPointMap) /* We will need this below */ -extern Tcl_FSDupInternalRepProc NativeDupInternalRep; +extern Tcl_FSDupInternalRepProc TclNativeDupInternalRep; #ifdef __WIN32__ #ifndef STATIC_BUILD @@ -768,7 +768,7 @@ TclWinDriveLetterForVolMountPoint(CONST WCHAR *mountPoint) } if (!alreadyStored) { dlPtr2 = (MountPointMap*) ckalloc(sizeof(MountPointMap)); - dlPtr2->volumeName = NativeDupInternalRep(Target); + dlPtr2->volumeName = TclNativeDupInternalRep(Target); dlPtr2->driveLetter = 'A' + (drive[0] - L'A'); dlPtr2->nextPtr = driveLetterLookup; driveLetterLookup = dlPtr2; @@ -789,7 +789,7 @@ TclWinDriveLetterForVolMountPoint(CONST WCHAR *mountPoint) * up each time. */ dlPtr2 = (MountPointMap*) ckalloc(sizeof(MountPointMap)); - dlPtr2->volumeName = NativeDupInternalRep((ClientData)mountPoint); + dlPtr2->volumeName = TclNativeDupInternalRep((ClientData)mountPoint); dlPtr2->driveLetter = -1; dlPtr2->nextPtr = driveLetterLookup; driveLetterLookup = dlPtr2; diff --git a/win/tclWinFile.c b/win/tclWinFile.c index 82cb2ae..8768261 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.53 2003/08/27 20:12:03 davygrvy Exp $ + * RCS: @(#) $Id: tclWinFile.c,v 1.54 2003/09/29 22:38:21 dkf Exp $ */ //#define _WIN32_WINNT 0x0500 @@ -163,8 +163,6 @@ typedef NET_API_STATUS NET_API_FUNCTION NETAPIBUFFERFREEPROC typedef NET_API_STATUS NET_API_FUNCTION NETGETDCNAMEPROC (LPWSTR servername, LPWSTR domainname, LPBYTE *bufptr); -extern Tcl_FSDupInternalRepProc NativeDupInternalRep; - /* * Declarations for local procedures defined in this file: */ |