aboutsummaryrefslogtreecommitdiff
path: root/gdb/gdbtk.c
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>1997-08-01 19:24:55 +0000
committerIan Lance Taylor <ian@airs.com>1997-08-01 19:24:55 +0000
commit9b119644fcae6fa62749747e013cbc0b3c215217 (patch)
tree5f331f8ecabadaa470b3e3b97a8aef613cd983d4 /gdb/gdbtk.c
parent931cde32b14f43f734f59253f975554021592e05 (diff)
downloadgdb-9b119644fcae6fa62749747e013cbc0b3c215217.zip
gdb-9b119644fcae6fa62749747e013cbc0b3c215217.tar.gz
gdb-9b119644fcae6fa62749747e013cbc0b3c215217.tar.bz2
* gdbtk.c (Tcl_Alloc): Don't provide our own version of this if
_WIN32. (Tcl_Realloc, Tcl_Free): Likewise. * configure.in: Check for cygwin32 environment. Define and substitute WIN32LIBS and WIN32LDAPP. Always set configdir to unix; setting it to win was for an old Tcl/Tk configuration scheme. * aclocal.m4 (CY_AC_LOAD_TKCONFIG): Substitute TK_BUILD_INCLUDES. * Makefile.in (TK_CFLAGS): Add @TK_BUILD_INCLUDES@. (WIN32LDAPP, WIN32LIBS): Define. (CLIBS): Add $(WIN32LIBS). (gdb): Use $(WIN32LDAPP). * configure: Rebuild.
Diffstat (limited to 'gdb/gdbtk.c')
-rw-r--r--gdb/gdbtk.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/gdb/gdbtk.c b/gdb/gdbtk.c
index 051cdfc..13e8959 100644
--- a/gdb/gdbtk.c
+++ b/gdb/gdbtk.c
@@ -134,7 +134,11 @@ static int running_now;
static int disassemble_from_exec = -1;
-/* Supply malloc calls for tcl/tk. */
+#ifndef _WIN32
+
+/* Supply malloc calls for tcl/tk. We do not want to do this on
+ Windows, because Tcl_Alloc is probably in a DLL which will not call
+ the mmalloc routines. */
char *
Tcl_Alloc (size)
@@ -158,6 +162,8 @@ Tcl_Free(ptr)
free (ptr);
}
+#endif /* _WIN32 */
+
static void
null_routine(arg)
int arg;