summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--generic/tclEnv.c4
-rw-r--r--generic/tclIOUtil.c20
-rw-r--r--generic/tclStubInit.c2
-rw-r--r--win/tclWinFile.c6
4 files changed, 4 insertions, 28 deletions
diff --git a/generic/tclEnv.c b/generic/tclEnv.c
index deb5dcd..7108436 100644
--- a/generic/tclEnv.c
+++ b/generic/tclEnv.c
@@ -48,10 +48,6 @@ static void ReplaceString _ANSI_ARGS_((CONST char *oldStr,
void TclSetEnv _ANSI_ARGS_((CONST char *name,
CONST char *value));
void TclUnsetEnv _ANSI_ARGS_((CONST char *name));
-
-#if defined (__CYGWIN__) && defined(__WIN32__)
-static void TclCygwinPutenv _ANSI_ARGS_((CONST char *string));
-#endif
/*
*----------------------------------------------------------------------
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index da0eb46..1dfd4ba 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -6290,26 +6290,6 @@ SetFsPathFromAny(interp, objPtr)
transPtr = Tcl_FSJoinToPath(objPtr,0,NULL);
}
-#if defined(__CYGWIN__) && defined(__WIN32__)
- {
- extern int cygwin_conv_to_win32_path
- _ANSI_ARGS_((CONST char *, char *));
- char winbuf[MAX_PATH+1];
-
- /*
- * In the Cygwin world, call conv_to_win32_path in order to use the
- * mount table to translate the file name into something Windows will
- * understand. Take care when converting empty strings!
- */
- name = Tcl_GetStringFromObj(transPtr, &len);
- if (len > 0) {
- cygwin_conv_to_win32_path(name, winbuf);
- TclWinNoBackslash(winbuf);
- Tcl_SetStringObj(transPtr, winbuf, -1);
- }
- }
-#endif /* __CYGWIN__ && __WIN32__ */
-
/*
* Now we have a translated filename in 'transPtr'. This will have
* forward slashes on Windows, and will not contain any ~user
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index be50792..a5408f4 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -31,6 +31,7 @@
#undef Tcl_ValidateAllMemory
#undef Tcl_FindHashEntry
#undef Tcl_CreateHashEntry
+#undef TclSockMinimumBuffers
/*
* Keep a record of the original Notifier procedures, created in the
@@ -59,7 +60,6 @@ Tcl_NotifierProcs tclOriginalNotifier = {
#ifdef _WIN64
# define TclSockMinimumBuffersOld 0
#else
-#undef TclSockMinimumBuffers
int TclSockMinimumBuffersOld(sock, size)
int sock;
int size;
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 2c6150f..69d1838 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -223,7 +223,7 @@ WinLink(LinkSource, LinkTarget, linkAction)
/* Make sure source file doesn't exist */
attr = (*tclWinProcs->getFileAttributesProc)(LinkSource);
- if (attr != 0xffffffff) {
+ if (attr != -1) {
Tcl_SetErrno(EEXIST);
return -1;
}
@@ -237,7 +237,7 @@ WinLink(LinkSource, LinkTarget, linkAction)
}
/* Check the target */
attr = (*tclWinProcs->getFileAttributesProc)(LinkTarget);
- if (attr == 0xffffffff) {
+ if (attr == -1) {
/* The target doesn't exist */
TclWinConvertError(GetLastError());
return -1;
@@ -301,7 +301,7 @@ WinReadLink(LinkSource)
/* Make sure source file does exist */
attr = (*tclWinProcs->getFileAttributesProc)(LinkSource);
- if (attr == 0xffffffff) {
+ if (attr == -1) {
/* The source doesn't exist */
TclWinConvertError(GetLastError());
return NULL;