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.

diff --git a/gdb/ChangeLog-gdbtk b/gdb/ChangeLog-gdbtk
index d6cfe90d27f7b38b392fd4e025054a3994a772b9..469a3c69bd61a40889295fd5bcca8a77086e33dc 100644 (file)
--- 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 8edcc02b3dca6e16f56c041d838f7b34b0158a2b..52f25c2a4c7ee9f5d3ba543feb43334df83459fe 100644 (file)
--- 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 18a36d571c89a6b656b90f255117c3dfd3fcdb1e..1ebf9029c3d0abcee05bd7655b565ea78d037959 100644 (file)
--- 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;
        }
     }