summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--generic/default.h4
-rwxr-xr-xwin/configure2
-rw-r--r--win/tcl.m42
4 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index fa82630..a61cc41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-06 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * win/tcl.m4: add "-Wno-implicit-int" flag for gcc, as on UNIX
+ * win/configure (regenerated)
+ * generic/default.h Use tkUnixDefault.h under CygWin. With this change,
+ at least the X11 version of Tk can be built with cygwin
+
2008-11-06 Donal K. Fellows <dkf@users.sf.net>
* unix/configure.in: Work around the fact that the HP-UX system
diff --git a/generic/default.h b/generic/default.h
index 1859369..1f3a04c 100644
--- a/generic/default.h
+++ b/generic/default.h
@@ -10,14 +10,14 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: default.h,v 1.5 2004/03/17 18:15:42 das Exp $
+ * RCS: @(#) $Id: default.h,v 1.6 2008/11/06 22:19:00 nijtmans Exp $
*/
#ifndef _DEFAULT
#define _DEFAULT
#if defined(__WIN32__) || defined(_WIN32) || \
- defined(__CYGWIN__) || defined(__MINGW32__)
+ defined(__MINGW32__)
# include "tkWinDefault.h"
#else
# if defined(MAC_OSX_TK)
diff --git a/win/configure b/win/configure
index 997d6d2..54027b8 100755
--- a/win/configure
+++ b/win/configure
@@ -2819,7 +2819,7 @@ echo "$as_me: error: ${CC} does not support the -shared option.
CFLAGS_DEBUG=-g
CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
- CFLAGS_WARNING="-Wall"
+ CFLAGS_WARNING="-Wall -Wno-implicit-int"
LDFLAGS_DEBUG=
LDFLAGS_OPTIMIZE=
diff --git a/win/tcl.m4 b/win/tcl.m4
index 59b51c9..3447eb9 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -529,7 +529,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
CFLAGS_DEBUG=-g
CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
- CFLAGS_WARNING="-Wall"
+ CFLAGS_WARNING="-Wall -Wno-implicit-int"
LDFLAGS_DEBUG=
LDFLAGS_OPTIMIZE=