diff options
author | mdejong <mdejong> | 2003-01-13 07:01:04 (GMT) |
---|---|---|
committer | mdejong <mdejong> | 2003-01-13 07:01:04 (GMT) |
commit | b697c7922f1ca98c8c68a6a8c1e7f738a4a8667f (patch) | |
tree | ecc693efc09e654dadea6aa7a3df8c882e5b75ae /win/tcl.m4 | |
parent | 6638ab2cc75d41465a5191828f2c9acbab86af6b (diff) | |
download | tcl-b697c7922f1ca98c8c68a6a8c1e7f738a4a8667f.zip tcl-b697c7922f1ca98c8c68a6a8c1e7f738a4a8667f.tar.gz tcl-b697c7922f1ca98c8c68a6a8c1e7f738a4a8667f.tar.bz2 |
* generic/tcl.h: Skip Tcl's define of CHAR,
SHORT, and LONG when HAVE_WINNT_IGNORE_VOID
is defined. This avoids a bunch of compiler
warnings when building with Cygwin or Mingw.
* win/configure: Regen.
* win/configure.in: Define HAVE_WINNT_IGNORE_VOID
when we detect a winnt.h that still defines
CHAR, SHORT, and LONG when VOID has already
been defined.
* win/tcl.m4 (SC_LOAD_TCLCONFIG): Subst the
TCL_DEFS loaded from tclConfig.sh so that
Tcl defines can make it into the Tk Makefile.
Diffstat (limited to 'win/tcl.m4')
-rw-r--r-- | win/tcl.m4 | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -83,8 +83,7 @@ AC_DEFUN(SC_PATH_TKCONFIG, [ #------------------------------------------------------------------------ # SC_LOAD_TCLCONFIG -- # -# Load the tclConfig.sh file -# Currently a no-op for Windows +# Load the tclConfig.sh file. # # Arguments: # @@ -148,6 +147,8 @@ AC_DEFUN(SC_LOAD_TCLCONFIG, [ AC_SUBST(TCL_STUB_LIB_FILE) AC_SUBST(TCL_STUB_LIB_FLAG) AC_SUBST(TCL_STUB_LIB_SPEC) + + AC_SUBST(TCL_DEFS) ]) #------------------------------------------------------------------------ |