Use src/lib/w32/w32sockets.c for client

[empserver] / src / client / expect.c

diff --git a/src/client/expect.c b/src/client/expect.c
index 4d29a53697c212887cd61b4d9f27b86f8b5ef540..50aa789161f7278fb1b85f62bfe7334c95951d1e 100644 (file)
--- a/src/client/expect.c
+++ b/src/client/expect.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@
  *  ---
  *
  *  expect.c: Read from the socket, expecting to see a particular code.
- * 
+ *
  *  Known contributors to this file:
  *      Steve McClure, 1998
  *      Markus Armbruster, 2007
@@ -39,21 +39,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifndef _WIN32
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <unistd.h>
-#endif
 #include "misc.h"
 #include "proto.h"
 
-#ifdef _WIN32
-#define read(sock, buffer, buf_size) \
-       w32_recv((sock), (buffer), (buf_size), 0)
-#define write(sock, buffer, buf_size) \
-       w32_send((sock), (buffer), (buf_size), 0)
-#endif
-
 int
 recvline(int s, char *buf)
 {
@@ -92,7 +83,7 @@ parseid(char *line)
     char *end;
     long id;
 
-    id = strtol(line, &end, 16);
+    id = strtol(line, &end, 36);
     if (end == line || *end != ' ') {
        fprintf(stderr, "Malformed id in line %s", line);
        id = -1;