Index: gdb/Makefile.in =================================================================== RCS file: /cvs/src/src/gdb/Makefile.in,v retrieving revision 1.1099 diff -u -p -r1.1099 Makefile.in --- gdb/Makefile.in 15 Sep 2009 16:09:31 -0000 1.1099 +++ gdb/Makefile.in 16 Sep 2009 11:23:15 -0000 @@ -167,7 +167,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@ # Did the user give us a --with-gdb-datadir option? -GDB_DATADIR_PATH = @GDB_DATADIR_PATH@ +GDB_DATADIR = @GDB_DATADIR@ # Helper code from gnulib. LIBGNU = gnulib/libgnu.a @@ -899,13 +899,13 @@ xml-syscall-copy: .PHONY: xml-syscall-install xml-syscall-install: $(SHELL) $(srcdir)/../mkinstalldirs \ - $(DESTDIR)$(GDB_DATADIR_PATH)/$(XML_SYSCALLS_DIR) ; \ + $(DESTDIR)$(GDB_DATADIR)/$(XML_SYSCALLS_DIR) ; \ list='$(XML_SYSCALLS_FILES)' ; \ for file in $$list ; do \ f=$(srcdir)/$(XML_SYSCALLS_DIR)/$$file ; \ if test -f $$f ; then \ $(INSTALL_DATA) $$f \ - $(DESTDIR)$(GDB_DATADIR_PATH)/$(XML_SYSCALLS_DIR) ; \ + $(DESTDIR)$(GDB_DATADIR)/$(XML_SYSCALLS_DIR) ; \ fi ; \ done ; Index: gdb/configure =================================================================== RCS file: /cvs/src/src/gdb/configure,v retrieving revision 1.288 diff -u -p -r1.288 configure --- gdb/configure 10 Sep 2009 03:59:37 -0000 1.288 +++ gdb/configure 16 Sep 2009 11:23:17 -0000 @@ -13274,7 +13274,7 @@ WIN32LDAPP= case "${host}" in -*-*-cygwin* | *-*-mingw* ) +*-*-mingw* ) configdir="win" ;; *) Index: gdb/configure.ac =================================================================== RCS file: /cvs/src/src/gdb/configure.ac,v retrieving revision 1.106 diff -u -p -r1.106 configure.ac --- gdb/configure.ac 10 Sep 2009 03:59:36 -0000 1.106 +++ gdb/configure.ac 16 Sep 2009 11:23:17 -0000 @@ -1662,7 +1662,7 @@ AC_SUBST(WIN32LIBS) AC_SUBST(WIN32LDAPP) case "${host}" in -*-*-cygwin* | *-*-mingw* ) +*-*-mingw* ) configdir="win" ;; *) Index: gdb/gdbtk/generic/gdbtk-varobj.c =================================================================== RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-varobj.c,v retrieving revision 1.23 diff -u -p -r1.23 gdbtk-varobj.c --- gdb/gdbtk/generic/gdbtk-varobj.c 6 Apr 2009 23:11:10 -0000 1.23 +++ gdb/gdbtk/generic/gdbtk-varobj.c 16 Sep 2009 11:23:17 -0000 @@ -417,10 +417,12 @@ variable_children (Tcl_Interp *interp, s struct varobj *child; char *childname; int ix; + int from = -1; + int to = -1; list = Tcl_NewListObj (0, NULL); - children = varobj_list_children (var); + children = varobj_list_children (var, &from, &to); for (ix = 0; VEC_iterate (varobj_p, children, ix, child); ++ix) { Index: gdb/gdbtk/generic/gdbtk.c =================================================================== RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk.c,v retrieving revision 1.50 diff -u -p -r1.50 gdbtk.c --- gdb/gdbtk/generic/gdbtk.c 6 Apr 2009 23:33:32 -0000 1.50 +++ gdb/gdbtk/generic/gdbtk.c 16 Sep 2009 11:23:17 -0000 @@ -60,7 +60,7 @@ #include "gdbcmd.h" #ifdef __CYGWIN32__ -#include /* for cygwin32_attach_handle_to_fd */ +#include /* for cygwin_attach_handle_to_fd */ #endif extern void _initialize_gdbtk (void); @@ -526,7 +526,7 @@ gdbtk_init (void) * These are the commands to do some Windows Specific stuff... */ -#ifdef __WIN32__ +#if defined(__WIN32__) && !defined(__CYGWIN__) if (ide_create_messagebox_command (gdbtk_interp) != TCL_OK) error ("messagebox command initialization failed"); /* On Windows, create a sizebox widget command */ @@ -709,13 +709,13 @@ _initialize_gdbtk () break; default: AllocConsole (); - cygwin32_attach_handle_to_fd ("/dev/conin", 0, + cygwin_attach_handle_to_fd ("/dev/conin", 0, GetStdHandle (STD_INPUT_HANDLE), 1, GENERIC_READ); - cygwin32_attach_handle_to_fd ("/dev/conout", 1, + cygwin_attach_handle_to_fd ("/dev/conout", 1, GetStdHandle (STD_OUTPUT_HANDLE), 0, GENERIC_WRITE); - cygwin32_attach_handle_to_fd ("/dev/conout", 2, + cygwin_attach_handle_to_fd ("/dev/conout", 2, GetStdHandle (STD_ERROR_HANDLE), 0, GENERIC_WRITE); break; Index: gdb/gdbtk/plugins/Make-rules =================================================================== RCS file: /cvs/src/src/gdb/gdbtk/plugins/Make-rules,v retrieving revision 1.3 diff -u -p -r1.3 Make-rules --- gdb/gdbtk/plugins/Make-rules 2 Aug 2008 22:08:32 -0000 1.3 +++ gdb/gdbtk/plugins/Make-rules 16 Sep 2009 11:23:17 -0000 @@ -35,7 +35,7 @@ TCL_SHLIB_CFLAGS = @TCL_SHLIB_CFLAGS@ TCL_SHLIB_LD = @TCL_SHLIB_LD@ TCL_DBGX = @TCL_DBGX@ TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@ -TCL_INCLUDES = @TCL_INCLUDES@ +TCL_INCLUDES = @TCL_INCLUDES@ -I@TCL_SRC_DIR@/generic TCL_LIBRARY = @TCL_LIBRARY@ mkinstalldirs = $(srcdir)/../../../../mkinstalldirs Index: gdb/gdbtk/plugins/configure =================================================================== RCS file: /cvs/src/src/gdb/gdbtk/plugins/configure,v retrieving revision 1.5 diff -u -p -r1.5 configure --- gdb/gdbtk/plugins/configure 2 Feb 2009 23:18:06 -0000 1.5 +++ gdb/gdbtk/plugins/configure 16 Sep 2009 11:23:19 -0000 @@ -3325,61 +3325,6 @@ fi # Since we're not using autoconf > 2.1x, we cannot use AC_CONFIG_FILES. make_subdirs="" -# See if -mwin32 works for cygwin -case "${host}" in - *cygwin*) - ocflags=${CFLAGS} - CFLAGS="${CFLAGS} -mwin32" - -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -CFLAGS="${ocflags}" -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ;; - *) ;; -esac - # note toplevel plugin build directory plugin_builddir=`pwd` Index: gdb/gdbtk/plugins/configure.ac =================================================================== RCS file: /cvs/src/src/gdb/gdbtk/plugins/configure.ac,v retrieving revision 1.2 diff -u -p -r1.2 configure.ac --- gdb/gdbtk/plugins/configure.ac 2 Aug 2008 22:08:32 -0000 1.2 +++ gdb/gdbtk/plugins/configure.ac 16 Sep 2009 11:23:19 -0000 @@ -47,16 +47,6 @@ AC_SUBST(TCL_SHLIB_SUFFIX) # Since we're not using autoconf > 2.1x, we cannot use AC_CONFIG_FILES. make_subdirs="" -# See if -mwin32 works for cygwin -case "${host}" in - *cygwin*) - ocflags=${CFLAGS} - CFLAGS="${CFLAGS} -mwin32" - AC_TRY_COMPILE(,,,CFLAGS="${ocflags}") - ;; - *) ;; -esac - # note toplevel plugin build directory plugin_builddir=`pwd` Index: gdb/gdbtk/plugins/rhabout/rhabout.c =================================================================== RCS file: /cvs/src/src/gdb/gdbtk/plugins/rhabout/rhabout.c,v retrieving revision 1.2 diff -u -p -r1.2 rhabout.c --- gdb/gdbtk/plugins/rhabout/rhabout.c 8 Dec 2004 20:21:08 -0000 1.2 +++ gdb/gdbtk/plugins/rhabout/rhabout.c 16 Sep 2009 11:23:19 -0000 @@ -1,5 +1,12 @@ /* Sample command procedure library for a plug-in. */ +/* quick and dirty hack since DEFS are not passed down + * to this level. + */ +#if defined(__CYGWIN__) && !defined(HAVE_UNISTD_H) +#define HAVE_UNISTD_H +#endif + /* You have to include the Tcl headers, of course. */ #include Index: libgui/configure =================================================================== RCS file: /cvs/src/src/libgui/configure,v retrieving revision 1.19 diff -u -p -r1.19 configure --- libgui/configure 2 Aug 2008 23:33:36 -0000 1.19 +++ libgui/configure 16 Sep 2009 11:23:23 -0000 @@ -4416,22 +4416,6 @@ if test x$ide_cv_os_cygwin32 = xyes; the ac_win_build="yes" fi -case "${host}" in -*-*-cygwin*) - touch ac$$.c - if ${CC} -c -mwin32 ac$$.c >/dev/null 2>&1; then - case "$LIBGUI_CFLAGS" in - *-mwin32*) ;; - *) LIBGUI_CFLAGS="-mwin32 $LIBGUI_CFLAGS" ;; - esac - fi - rm -f ac$$.o ac$$.c - ;; -esac -case "${host}" in -*-*-cygwin*) - LIBGUI_CFLAGS="-DWIN32 $LIBGUI_CFLAGS" ;; -esac tmp="`cd $srcdir/library; pwd`" Index: libgui/configure.ac =================================================================== RCS file: /cvs/src/src/libgui/configure.ac,v retrieving revision 1.4 diff -u -p -r1.4 configure.ac --- libgui/configure.ac 2 Aug 2008 23:33:36 -0000 1.4 +++ libgui/configure.ac 16 Sep 2009 11:23:23 -0000 @@ -51,23 +51,6 @@ ac_win_build="no" if test x$ide_cv_os_cygwin32 = xyes; then ac_win_build="yes" fi - -case "${host}" in -*-*-cygwin*) - touch ac$$.c - if ${CC} -c -mwin32 ac$$.c >/dev/null 2>&1; then - case "$LIBGUI_CFLAGS" in - *-mwin32*) ;; - *) LIBGUI_CFLAGS="-mwin32 $LIBGUI_CFLAGS" ;; - esac - fi - rm -f ac$$.o ac$$.c - ;; -esac -case "${host}" in -*-*-cygwin*) - LIBGUI_CFLAGS="-DWIN32 $LIBGUI_CFLAGS" ;; -esac AC_SUBST(LIBGUI_CFLAGS) tmp="`cd $srcdir/library; pwd`" Index: libgui/src/tclshellexe.c =================================================================== RCS file: /cvs/src/src/libgui/src/tclshellexe.c,v retrieving revision 1.2 diff -u -p -r1.2 tclshellexe.c --- libgui/src/tclshellexe.c 8 Sep 2001 22:34:47 -0000 1.2 +++ libgui/src/tclshellexe.c 16 Sep 2009 11:23:23 -0000 @@ -3,7 +3,7 @@ Written by Tom Tromey ; Code mostly taken from S-N. */ -#ifdef _WIN32 +#if defined(_WIN32) || defined(__CYGWIN__) #include