← Back to branch summary

~ubuntu-branches/debian/squeeze/freeciv/squeeze

« back to all changes in this revision

Viewing changes to client/servers.c

  • Committer: Bazaar Package Importer
  • Author(s): Clint Adams
  • Date: 2008-11-29 22:25:59 UTC
  • mfrom: (1.2.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20081129222559-6sqqdum8qnhykm4l
Tags: 2.1.8-1
http://bugs.debian.org/495740
* New upstream release.  closes: #495740.
* Disable GGZ support (can be re-enabled when ggz 1.0 is available).
* Change maintainer to Debian Games Team.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/servers.c
350
350
    result = my_readsocket(scan->sock, buf, sizeof(buf));
351
351
 
352
352
    if (result < 0) {
353
 
      if (errno == EAGAIN || errno == EINTR) {
 
353
      if (errno == EAGAIN || errno == EINTR || errno == EWOULDBLOCK) {
354
354
        /* Keep waiting. */
355
355
        return;
356
356
      }
533
533
  union my_sockaddr addr;
534
534
  struct data_out dout;
535
535
  int sock, opt = 1;
 
536
#ifndef HAVE_WINSOCK
536
537
  unsigned char buffer[MAX_LEN_PACKET];
 
538
#else  /* HAVE_WINSOCK */
 
539
  char buffer[MAX_LEN_PACKET];
 
540
#endif /* HAVE_WINSOCK */
537
541
  struct ip_mreq mreq;
538
542
  const char *group;
539
543
  size_t size;