some more cygwin compatibility improvements

14 files changed, 24 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index 1bdaa06..1bdaa06 100644..100755
--- a/ChangeLog
+++ b/ChangeLog
diff --git a/doc/canvas.n b/doc/canvas.n
index 5ea3035..5ea3035 100644..100755
--- a/doc/canvas.n
+++ b/doc/canvas.n
diff --git a/generic/default.h b/generic/default.h
index dd4f609..dd4f609 100644..100755
--- a/generic/default.h
+++ b/generic/default.h
diff --git a/generic/tkColor.c b/generic/tkColor.c
index a5a1136..a5a1136 100644..100755
--- a/generic/tkColor.c
+++ b/generic/tkColor.c
diff --git a/generic/tkMenu.c b/generic/tkMenu.c
index c996df8..19031c5 100644..100755
--- a/generic/tkMenu.c
+++ b/generic/tkMenu.c
@@ -101,7 +101,7 @@ TCL_DECLARE_MUTEX(menuMutex)
  * to update code in TkpMenuInit that changes the font string entry.
  */
 
-char *tkMenuStateStrings[] = {"active", "normal", "disabled", (char *) NULL};
+CONST char *tkMenuStateStrings[] = {"active", "normal", "disabled", (char *) NULL};
 
 static CONST char *menuEntryTypeStrings[] = {
     "cascade", "checkbutton", "command", "radiobutton", "separator",
@@ -113,7 +113,7 @@ static CONST char *menuEntryTypeStrings[] = {
  * It is used with the "enum compound" declaration in tkMenu.h
  */
 
-static char *compoundStrings[] = {
+static const char *compoundStrings[] = {
     "bottom", "center", "left", "none", "right", "top", (char *) NULL
 };
 
diff --git a/generic/tkMenu.h b/generic/tkMenu.h
index 767e3fc..a428d4c 100644
--- a/generic/tkMenu.h
+++ b/generic/tkMenu.h
@@ -238,7 +238,7 @@ typedef struct TkMenuEntry {
  * Menu states
  */
 
-EXTERN char *tkMenuStateStrings[];
+EXTERN CONST char *tkMenuStateStrings[];
 
 #define ENTRY_ACTIVE 0
 #define ENTRY_NORMAL 1
diff --git a/tests/color.test b/tests/color.test
index 8557252..8557252 100644..100755
--- a/tests/color.test
+++ b/tests/color.test
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 8ff420a..8ff420a 100644..100755
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
diff --git a/unix/tkUnixColor.c b/unix/tkUnixColor.c
index 722dd06..722dd06 100644..100755
--- a/unix/tkUnixColor.c
+++ b/unix/tkUnixColor.c
diff --git a/win/tcl.m4 b/win/tcl.m4
index 752f022..ab47afc 100644..100755
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -34,7 +34,11 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
 	AC_MSG_ERROR(Tcl directory $TCL_BIN_DIR does not exist)
     fi
     if test ! -f $TCL_BIN_DIR/tclConfig.sh; then
-	AC_MSG_ERROR(There is no tclConfig.sh in $TCL_BIN_DIR:  perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?)
+	if test ! -f $TCL_BIN_DIR/../unix/tclConfig.sh; then
+	    AC_MSG_ERROR(There is no tclConfig.sh in $TCL_BIN_DIR:  perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?)
+	fi
+	TCL_BIN_DIR=`cd ${TCL_BIN_DIR}/../unix; pwd`
+	CFLAGS="$CFLAGS -mwin32"
     fi
     AC_MSG_RESULT($TCL_BIN_DIR/tclConfig.sh)
 ])
@@ -413,12 +417,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
       AC_CACHE_CHECK(for cross-compile version of gcc,
 	ac_cv_cross,
 	AC_TRY_COMPILE([
-	    #ifdef __WIN32__
+	    #ifndef __WIN32__
 		#error cross-compiler
 	    #endif
 	], [],
-	ac_cv_cross=yes,
-	ac_cv_cross=no)
+	ac_cv_cross=no,
+	ac_cv_cross=yes)
       )
 
       if test "$ac_cv_cross" = "yes"; then
@@ -589,12 +593,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 		;;
 	    *)
 		AC_TRY_COMPILE([
-		    #ifdef _WIN64
-			#error 64-bit
+		    #ifndef _WIN64
+			#error 32-bit
 		    #endif
 		], [],
-			tcl_win_64bit=no,
-			tcl_win_64bit=yes
+			tcl_win_64bit=yes,
+			tcl_win_64bit=no
 		)
 		if test "$tcl_win_64bit" = "yes" ; then
 			do64bit=amd64
diff --git a/win/tkWinDraw.c b/win/tkWinDraw.c
index d0a609f..805dde3 100644..100755
--- a/win/tkWinDraw.c
+++ b/win/tkWinDraw.c
@@ -24,7 +24,7 @@
  * Translation table between X gc functions and Win32 raster op modes.
  */
 
-int tkpWinRopModes[] = {
+CONST int tkpWinRopModes[] = {
     R2_BLACK,			/* GXclear */
     R2_MASKPEN,			/* GXand */
     R2_MASKPENNOT,		/* GXandReverse */
@@ -55,7 +55,7 @@ int tkpWinRopModes[] = {
 #define SRCORREVERSE	(DWORD)0x00DD0228 /* dest = source OR (NOT dest) */
 #define SRCNAND		(DWORD)0x007700E6 /* dest = NOT (source AND dest) */
 
-int tkpWinBltModes[] = {
+CONST int tkpWinBltModes[] = {
     BLACKNESS,			/* GXclear */
     SRCAND,			/* GXand */
     SRCERASE,			/* GXandReverse */
@@ -93,9 +93,10 @@ int tkpWinBltModes[] = {
 /*
  * Macros used later in the file.
  */
-
-#define MIN(a,b)	((a>b) ? b : a)
-#define MAX(a,b)	((a<b) ? b : a)
+#ifndef MIN
+#   define MIN(a,b)	((a>b) ? b : a)
+#   define MAX(a,b)	((a<b) ? b : a)
+#endif
 
 /*
  * The followng typedef is used to pass Windows GDI drawing functions.
diff --git a/win/tkWinInt.h b/win/tkWinInt.h
index efff755..7ab4ff4 100644..100755
--- a/win/tkWinInt.h
+++ b/win/tkWinInt.h
@@ -128,8 +128,8 @@ typedef struct {
  * Win32 raster and BitBlt op modes.
  */
 
-extern int tkpWinRopModes[];
-extern int tkpWinBltModes[];
+extern CONST int tkpWinRopModes[];
+extern CONST int tkpWinBltModes[];
 
 /*
  * The following defines are used with TkWinGetBorderPixels to get the
diff --git a/xlib/rgb.txt b/xlib/rgb.txt
index 67b979e..67b979e 100644..100755
--- a/xlib/rgb.txt
+++ b/xlib/rgb.txt
diff --git a/xlib/xcolors.c b/xlib/xcolors.c
index 04cb1af..9e10175 100644..100755
--- a/xlib/xcolors.c
+++ b/xlib/xcolors.c
@@ -230,7 +230,7 @@ static const elem xColors[] = {
  *----------------------------------------------------------------------
  */
 
-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__CYGWIN__)
 #   ifdef NO_STRTOI64
 /* This version only handles hex-strings without 0x prefix */
 static __int64