diff options
| author | Geoffrey Noer <noer@cygnus> | 1998-11-19 21:18:29 +0000 |
|---|---|---|
| committer | Geoffrey Noer <noer@cygnus> | 1998-11-19 21:18:29 +0000 |
| commit | 1798621bcfba5697d3f5229ba1124060d8f91432 (patch) | |
| tree | dfa0e27b1d05d1ec31aaf235787637a9a58f87e3 /gdb | |
| parent | e17387a51f39673d1c86e6ee312ca3e1936d5fdd (diff) | |
| download | gdb-1798621bcfba5697d3f5229ba1124060d8f91432.zip gdb-1798621bcfba5697d3f5229ba1124060d8f91432.tar.gz gdb-1798621bcfba5697d3f5229ba1124060d8f91432.tar.bz2 | |
Thu Nov 19 13:14:57 1998 Geoffrey Noer <noer@cygnus.com>
* gdbtk-cmds.c: Can't start using new API names yet. Switch
back
to calling cygwin32_ funcs until some time has passed...
* gdbtk.c: Ditto. Also, include sys/cygwin.h for Cygwin,
instead
of providing own proto.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog-gdbtk | 7 | ||||
| -rw-r--r-- | gdb/gdbtk-cmds.c | 2 | ||||
| -rw-r--r-- | gdb/gdbtk.c | 23 |
3 files changed, 21 insertions, 11 deletions
diff --git a/gdb/ChangeLog-gdbtk b/gdb/ChangeLog-gdbtk index d6cfe90..469a3c6 100644 --- a/gdb/ChangeLog-gdbtk +++ b/gdb/ChangeLog-gdbtk @@ -1,3 +1,10 @@ +Thu Nov 19 13:14:57 1998 Geoffrey Noer <noer@cygnus.com> + + * gdbtk-cmds.c: Can't start using new API names yet. Switch back + to calling cygwin32_ funcs until some time has passed... + * gdbtk.c: Ditto. Also, include sys/cygwin.h for Cygwin, instead + of providing own proto. + Fri Nov 13 00:15:08 1998 Geoffrey Noer <noer@cygnus.com> Changes to account for name change from cygwin32 to cygwin and diff --git a/gdb/gdbtk-cmds.c b/gdb/gdbtk-cmds.c index 8edcc02..52f25c2 100644 --- a/gdb/gdbtk-cmds.c +++ b/gdb/gdbtk-cmds.c @@ -3438,7 +3438,7 @@ gdb_path_conv (clientData, interp, objc, objv) { char pathname[256], *ptr; - cygwin_conv_to_full_win32_path (Tcl_GetStringFromObj (objv[1], NULL), pathname); + cygwin32_conv_to_full_win32_path (Tcl_GetStringFromObj (objv[1], NULL), pathname); for (ptr = pathname; *ptr; ptr++) { if (*ptr == '\\') diff --git a/gdb/gdbtk.c b/gdb/gdbtk.c index 18a36d5..1ebf902 100644 --- a/gdb/gdbtk.c +++ b/gdb/gdbtk.c @@ -71,6 +71,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "annotate.h" #include <sys/time.h> +#ifdef __CYGWIN__ +#include <sys/cygwin.h> /* for cygwin32_attach_handle_to_fd */ +#endif + /* For Cygwin, we use a timer to periodically check for Windows messages. FIXME: It would be better to not poll, but to instead rewrite the target_wait routines to serve as input sources. @@ -687,7 +691,6 @@ _initialize_gdbtk () else { DWORD ft = GetFileType (GetStdHandle (STD_INPUT_HANDLE)); - void cygwin_attach_handle_to_fd (char *, int, HANDLE, int, int); switch (ft) { @@ -697,15 +700,15 @@ _initialize_gdbtk () break; default: AllocConsole(); - cygwin_attach_handle_to_fd ("/dev/conin", 0, - GetStdHandle (STD_INPUT_HANDLE), - 1, GENERIC_READ); - cygwin_attach_handle_to_fd ("/dev/conout", 1, - GetStdHandle (STD_OUTPUT_HANDLE), - 0, GENERIC_WRITE); - cygwin_attach_handle_to_fd ("/dev/conout", 2, - GetStdHandle (STD_ERROR_HANDLE), - 0, GENERIC_WRITE); + cygwin32_attach_handle_to_fd ("/dev/conin", 0, + GetStdHandle (STD_INPUT_HANDLE), + 1, GENERIC_READ); + cygwin32_attach_handle_to_fd ("/dev/conout", 1, + GetStdHandle (STD_OUTPUT_HANDLE), + 0, GENERIC_WRITE); + cygwin32_attach_handle_to_fd ("/dev/conout", 2, + GetStdHandle (STD_ERROR_HANDLE), + 0, GENERIC_WRITE); break; } } |