summaryrefslogtreecommitdiffstats
path: root/win/winMain.c
diff options
context:
space:
mode:
authorhobbs <hobbs>2002-09-27 00:48:06 (GMT)
committerhobbs <hobbs>2002-09-27 00:48:06 (GMT)
commiteb33d6b2e1af56f6f898c2c4343cea19e0e251c7 (patch)
treeac500753c542a0bf349fde96c932ce0bbe716471 /win/winMain.c
parent0dad9658b522536e5883baac0e78eba1fa910103 (diff)
downloadtk-eb33d6b2e1af56f6f898c2c4343cea19e0e251c7.zip
tk-eb33d6b2e1af56f6f898c2c4343cea19e0e251c7.tar.gz
tk-eb33d6b2e1af56f6f898c2c4343cea19e0e251c7.tar.bz2
2002-09-18 Mumit Khan <khan@nanotech.wisc.edu>
Added basic Cygwin support. * win/tcl.m4 (SC_PATH_TCLCONFIG): Support one-tree build. (SC_PATH_TKCONFIG): Likewise. (SC_PROG_TCLSH): Likewise. (SC_CONFIG_CFLAGS): Assume real Cygwin port and remove -mno-cygwin flags. Add -mwin32 to extra_cflags and extra_ldflags. Remove ``-e _WinMain@16'' from LDFLAGS_WINDOW. * win/configure: Regenerate. * win/tkWinPort.h (tchar.h): Do not include on Cygwin. (_T): Define for Cygwin. * win/winMain.c (main): Conditionally define.
Diffstat (limited to 'win/winMain.c')
-rw-r--r--win/winMain.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/win/winMain.c b/win/winMain.c
index a5478a9..1c4e465 100644
--- a/win/winMain.c
+++ b/win/winMain.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: winMain.c,v 1.12 2002/08/26 14:32:18 dgp Exp $
+ * RCS: @(#) $Id: winMain.c,v 1.13 2002/09/27 00:48:06 hobbs Exp $
*/
#include <tk.h>
@@ -354,8 +354,8 @@ setargv(argcPtr, argvPtr)
*argcPtr = argc;
*argvPtr = argv;
}
-
+#if !defined(__GNUC__) || defined(TK_TEST)
/*
*----------------------------------------------------------------------
*
@@ -404,4 +404,5 @@ int main(int argc, char **argv)
Tk_Main(argc, argv, Tcl_AppInit);
return 0;
}
+#endif /* !__GNUC__ || TK_TEST */