Fix TCL_LL_MODIFIER for Cygwin

and various other minor CYGWIN
compilation problems

4 files changed, 17 insertions, 12 deletions

diff --git a/generic/tcl.h b/generic/tcl.h
index 75975bf..fb8a27b 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -13,7 +13,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tcl.h,v 1.295 2009/12/23 20:12:39 dkf Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.296 2010/01/13 06:46:56 nijtmans Exp $
  */
 
 #ifndef _TCL
@@ -377,7 +377,7 @@ typedef long LONG;
 #      if defined(__WIN32__) && !defined(__CYGWIN__)
 #         define TCL_LL_MODIFIER        "I64"
 #      else
-#         define TCL_LL_MODIFIER	"L"
+#         define TCL_LL_MODIFIER	"ll"
 #      endif
 typedef struct stat	Tcl_StatBuf;
 #   elif defined(__WIN32__)
diff --git a/generic/tclEnv.c b/generic/tclEnv.c
index 40650de..f89ca41 100644
--- a/generic/tclEnv.c
+++ b/generic/tclEnv.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclEnv.c,v 1.40 2009/12/21 23:25:40 nijtmans Exp $
+ * RCS: @(#) $Id: tclEnv.c,v 1.41 2010/01/13 06:46:56 nijtmans Exp $
  */
 
 #include "tclInt.h"
@@ -695,8 +695,6 @@ TclFinalizeEnvironment(void)
 
 #if defined(__CYGWIN__)
 
-#include <windows.h>
-
 /*
  * When using cygwin, when an environment variable changes, we need to synch
  * with both the cygwin environment (in case the application C code calls
@@ -757,11 +755,15 @@ TclCygwinPutenv(
 	 */
 
 	if (strcmp(name, "Path") == 0) {
+#ifdef __WIN32__
 	    SetEnvironmentVariable("PATH", NULL);
+#endif
 	    unsetenv("PATH");
 	}
 
+#ifdef __WIN32__
 	SetEnvironmentVariable(name, value);
+#endif
     } else {
 	char *buf;
 
@@ -769,7 +771,9 @@ TclCygwinPutenv(
 	 * Eliminate any Path variable, to prevent any confusion.
 	 */
 
+#ifdef __WIN32__
 	SetEnvironmentVariable("Path", NULL);
+#endif
 	unsetenv("Path");
 
 	if (value == NULL) {
@@ -782,7 +786,9 @@ TclCygwinPutenv(
 	    cygwin_posix_to_win32_path_list(value, buf);
 	}
 
+#ifdef __WIN32__
 	SetEnvironmentVariable(name, buf);
+#endif
     }
 }
 #endif /* __CYGWIN__ */
diff --git a/generic/tclInt.h b/generic/tclInt.h
index bf13446..36aa1ea 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -15,7 +15,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclInt.h,v 1.453 2009/12/11 04:47:13 msofer Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.454 2010/01/13 06:46:56 nijtmans Exp $
  */
 
 #ifndef _TCLINT
@@ -40,6 +40,7 @@
 #ifdef HAVE_TCL_CONFIG_H
 #include "tclConfig.h"
 #endif
+#include "tclPort.h"
 #ifndef _TCL
 #include "tcl.h"
 #endif
@@ -2927,7 +2928,6 @@ MODULE_SCOPE Tcl_Obj *	TclPathPart(Tcl_Interp *interp, Tcl_Obj *pathPtr,
 			    Tcl_PathPart portion);
 MODULE_SCOPE char *	TclpReadlink(const char *fileName,
 			    Tcl_DString *linkPtr);
-MODULE_SCOPE void	TclpReleaseFile(TclFile file);
 MODULE_SCOPE void	TclpSetInterfaces(void);
 MODULE_SCOPE void	TclpSetVariables(Tcl_Interp *interp);
 MODULE_SCOPE void	TclpUnloadFile(Tcl_LoadHandle loadHandle);
@@ -4437,7 +4437,6 @@ typedef struct TEOV_callback {
 #define NRE_ASSERT(expr)
 #endif
 
-#include "tclPort.h"
 #include "tclIntDecls.h"
 #include "tclIntPlatDecls.h"
 #include "tclTomMathDecls.h"
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h
index 44358c2..bcd8fc3 100644
--- a/generic/tclPlatDecls.h
+++ b/generic/tclPlatDecls.h
@@ -6,7 +6,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tclPlatDecls.h,v 1.34 2009/12/21 23:25:40 nijtmans Exp $
+ * RCS: @(#) $Id: tclPlatDecls.h,v 1.35 2010/01/13 06:46:56 nijtmans Exp $
  */
 
 #ifndef _TCLPLATDECLS
@@ -26,7 +26,9 @@
 /*
  *  Pull in the typedef of TCHAR for windows.
  */
-#if defined(__WIN32__) && !defined(_TCHAR_DEFINED)
+#if defined(__CYGWIN__)
+    typedef char TCHAR;
+#elif defined(__WIN32__) && !defined(_TCHAR_DEFINED)
 #   include <tchar.h>
 #   ifndef _TCHAR_DEFINED
 	/* Borland seems to forget to set this. */
@@ -37,8 +39,6 @@
 	/* MSVC++ misses this. */
 	typedef _TCHAR TCHAR;
 #   endif
-#elif defined(__CYGWIN__)
-    typedef char TCHAR;
 #endif
 
 /* !BEGIN!: Do not edit below this line. */