← Back to branch summary

~ubuntu-branches/debian/sid/freeciv/sid

« back to all changes in this revision

Viewing changes to utility/netintf.h

  • Committer: Package Import Robot
  • Author(s): Clint Adams, Karl Goetz, Clint Adams
  • Date: 2011-08-28 22:40:00 UTC
  • mfrom: (1.2.19 upstream)
  • Revision ID: package-import@ubuntu.com-20110828224000-j2r1erewlem25dox
Tags: 2.3.0-1
[ Karl Goetz ]
* New upstream version.
* Fix themes_sdl_use_system_fonts.diff to apply cleanly on 2.3.0
* Massage work_around_unity_induced_breakage.diff to get it
  applying to the new codebase (The patch assumes commits made
  after 2.3.0 was tagged upstream).

[ Clint Adams ]
* Fudge build system to think there is no libtool mismatch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
utility/netintf.h
41
41
#endif
42
42
 
43
43
#include "ioz.h"
44
 
#include "shared.h"             /* bool type */
 
44
#include "support.h"            /* bool type */
45
45
 
46
46
/* map symbolic Winsock error names to symbolic errno names */
47
47
#ifdef HAVE_WINSOCK
62
62
#endif /* HAVE_WINSOCK */
63
63
 
64
64
#ifdef FD_ZERO
65
 
#define MY_FD_ZERO FD_ZERO
 
65
#define FC_FD_ZERO FD_ZERO
66
66
#else
67
 
#define MY_FD_ZERO(p) memset((void *)(p), 0, sizeof(*(p)))
 
67
#define FC_FD_ZERO(p) memset((void *)(p), 0, sizeof(*(p)))
68
68
#endif
69
69
 
70
70
#ifdef IPV6_ADD_MEMBERSHIP