(NS_ALL) [_WIN32]: Change NS_EVERYTHING back to NS_ALL, #undef NS_ALL to prevent conflict with winsock2.h

include/nsc.h

@@ -129,7 +129,7 @@ typedef enum {
     NS_LIST,			/* list of IDs */
     NS_DIST,			/* circular area */
     NS_AREA,			/* rectangular area */
-    NS_EVERYTHING,		/* everything */
+    NS_ALL,		/* everything */
     NS_XY,			/* one sector area */
     NS_GROUP			/* group, i.e. fleet, wing, army */
 } ns_seltype;

src/lib/commands/tend.c

@@ -232,8 +232,8 @@ tend_nxtitem(struct nstr_item *np, void *ptr)
 	case NS_LIST:
 	    /* The change is to take the player->owner check out here */
 	    break;
-	case NS_EVERYTHING:
-	    /* XXX maybe combine NS_LIST and NS_EVERYTHING later */
+	case NS_ALL:
+	    /* XXX maybe combine NS_LIST and NS_ALL later */
 	    break;
 	case NS_DIST:
 	    if (!xyinrange(gp->x, gp->y, &np->range)) {

src/lib/empthread/ntthread.c

@@ -56,6 +56,7 @@
 
 #if defined(_WIN32) && defined(_EMPTH_WIN32)
 #include <winsock2.h>
+#undef NS_ALL
 #include <windows.h>
 #include <process.h>
 

src/lib/gen/io.c

@@ -53,6 +53,7 @@
 
 #if defined(_WIN32)
 #include <winsock2.h>
+#undef NS_ALL
 #endif
 
 #include "misc.h"

src/lib/player/accept.c

@@ -31,6 +31,11 @@
  *     Dave Pare, 1994
  */
 
+#if defined(_WIN32)
+#include <winsock2.h>
+#undef NS_ALL
+#endif
+
 #include "prototypes.h"
 #include "misc.h"
 #include "proto.h"
@@ -51,8 +56,6 @@
 #include <netinet/in.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
-#else
-#include <winsock2.h>
 #endif
 #include <signal.h>
 #include <errno.h>

src/lib/subs/nxtitem.c

@@ -72,8 +72,8 @@ nxtitem(struct nstr_item *np, void *ptr)
 	    if ((np->flags & EFF_OWNER) && !player->owner)
 		selected = 0;
 	    break;
-	case NS_EVERYTHING:
-	    /* XXX maybe combine NS_LIST and NS_EVERYTHING later */
+	case NS_ALL:
+	    /* XXX maybe combine NS_LIST and NS_ALL later */
 	    break;
 	case NS_DIST:
 	    if (!xyinrange(gp->x, gp->y, &np->range)) {

src/lib/subs/sarg.c

@@ -48,7 +48,7 @@
  *  #1, lx:ly,hx:hy --> NS_AREA
  *  @x,y:dist  --> NS_DIST
  *  %d or %d/%d/%d --> NS_LIST
- *  * --> NS_EVERYTHING
+ *  * --> NS_ALL
  *
  * or 0 for none of the above.
  */
@@ -61,7 +61,7 @@ sarg_type(char *str)
     if (c == '@')
 	return NS_DIST;
     if (c == '*')
-	return NS_EVERYTHING;
+	return NS_ALL;
     if (c == '#' || strchr(str, ',') != 0)
 	return NS_AREA;
     if (isdigit(c))

src/lib/subs/snxtitem.c

@@ -40,7 +40,7 @@
 
 /*
  * setup the nstr structure for sector selection.
- * can select on NS_EVERYTHING, NS_AREA, NS_DIST, and NS_LIST.
+ * can select on NS_ALL, NS_AREA, NS_DIST, and NS_LIST.
  * iterate thru the "condarg" string looking
  * for arguments to compile into the nstr.
  */
@@ -89,7 +89,7 @@ snxtitem(struct nstr_item *np, int type, s_char *str)
 	    return 0;
 	snxtitem_dist(np, type, cx, cy, dist);
 	break;
-    case NS_EVERYTHING:
+    case NS_ALL:
 	snxtitem_all(np, type);
 	break;
     case NS_LIST:
@@ -184,7 +184,7 @@ snxtitem_all(struct nstr_item *np, int type)
 {
     memset(np, 0, sizeof(*np));
     np->cur = -1;
-    np->sel = NS_EVERYTHING;
+    np->sel = NS_ALL;
     np->type = type;
     np->index = -1;
     np->read = ef_read;

src/lib/subs/snxtsct.c

@@ -41,7 +41,7 @@
 
 /*
  * setup the nstr_sect structure for sector selection.
- * can select on either NS_EVERYTHING, NS_AREA, or NS_RANGE
+ * can select on either NS_ALL, NS_AREA, or NS_RANGE
  * iterate thru the "condarg" string looking
  * for arguments to compile into the nstr.
  */
@@ -74,7 +74,7 @@ snxtsct(struct nstr_sect *np, s_char *str)
 	    return 0;
 	snxtsct_dist(np, cx, cy, dist);
 	break;
-    case NS_EVERYTHING:
+    case NS_ALL:
 	/* fake "all" by doing a world-sized area query */
 	snxtsct_area(np, &wr);
 	break;

src/lib/update/nxtitemp.c

@@ -74,8 +74,8 @@ nxtitemp(struct nstr_item *np, int owner)
 	    if ((np->flags & EFF_OWNER) && !owner)
 		selected = 0;
 	    break;
-	case NS_EVERYTHING:
-	    /* XXX maybe combine NS_LIST and NS_EVERYTHING later */
+	case NS_ALL:
+	    /* XXX maybe combine NS_LIST and NS_ALL later */
 	    break;
 	case NS_DIST:
 	    if (!xyinrange(gp->x, gp->y, &np->range)) {

src/server/main.c

@@ -47,6 +47,7 @@
 
 #if defined(_WIN32)
 #include <winsock2.h>
+#undef NS_ALL
 #include <process.h>
 #include "../lib/gen/getopt.h"
 #include "service.h"