* remote-utils.c [USE_WIN32API] (read, write): Define.

	(putpkt_binary, input_interrupt, readchar, getpkt): Use read and
	write.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 8336ecabaf86e67e80e63811ba771c9ff1680745..60728cd61def557381eb8dc8c2c5395f01049b25 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-29  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * remote-utils.c [USE_WIN32API] (read, write): Define.
+       (putpkt_binary, input_interrupt, readchar, getpkt): Use read and
+       write.
+
 2007-01-09  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * linux-i386-low.c (the_low_target): Set arch_string.

diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c
index 7349705d1b87d82e7489c3a71fba53313a9bc837..751f63a5f748a24a42a628b8624dfb5854646b4f 100644 (file)
--- a/gdb/gdbserver/remote-utils.c
+++ b/gdb/gdbserver/remote-utils.c
@@ -86,6 +86,11 @@ static int remote_desc;
 extern int using_threads;
 extern int debug_threads;
 
+#ifdef USE_WIN32API
+# define read(fd, buf, len) recv (fd, buf, len, 0)
+# define write(fd, buf, len) send (fd, buf, len, 0)
+#endif
+
 /* Open a connection to a remote debugger.
    NAME is the filename used for communication.  */
 
@@ -515,7 +520,7 @@ putpkt_binary (char *buf, int cnt)
     {
       int cc;
 
-      if (send (remote_desc, buf2, p - buf2, 0) != p - buf2)
+      if (write (remote_desc, buf2, p - buf2) != p - buf2)
        {
          perror ("putpkt(write)");
          return -1;
@@ -526,7 +531,7 @@ putpkt_binary (char *buf, int cnt)
          fprintf (stderr, "putpkt (\"%s\"); [looking for ack]\n", buf2);
          fflush (stderr);
        }
-      cc = recv (remote_desc, buf3, 1, 0);
+      cc = read (remote_desc, buf3, 1);
       if (remote_debug)
        {
          fprintf (stderr, "[received '%c' (0x%x)]\n", buf3[0], buf3[0]);
@@ -587,7 +592,7 @@ input_interrupt (int unused)
       int cc;
       char c = 0;
       
-      cc = recv (remote_desc, &c, 1, 0);
+      cc = read (remote_desc, &c, 1);
 
       if (cc != 1 || c != '\003')
        {
@@ -668,7 +673,7 @@ readchar (void)
   if (bufcnt-- > 0)
     return *bufp++;
 
-  bufcnt = recv (remote_desc, buf, sizeof (buf), 0);
+  bufcnt = read (remote_desc, buf, sizeof (buf));
 
   if (bufcnt <= 0)
     {
@@ -735,7 +740,7 @@ getpkt (char *buf)
 
       fprintf (stderr, "Bad checksum, sentsum=0x%x, csum=0x%x, buf=%s\n",
               (c1 << 4) + c2, csum, buf);
-      send (remote_desc, "-", 1, 0);
+      write (remote_desc, "-", 1);
     }
 
   if (remote_debug)
@@ -744,7 +749,7 @@ getpkt (char *buf)
       fflush (stderr);
     }
 
-  send (remote_desc, "+", 1, 0);
+  write (remote_desc, "+", 1);
 
   if (remote_debug)
     {