(tend_nxtitem,nxtitem,sarg_type,snxtitem,snxtitem_all,snxtsct,nxtitemp):

change NS_ALL to NS_EVERYTHING in ns_seltype because of a
conflict with winsock2.h which is used in the WIN32 build.

diff --git a/include/nsc.h b/include/nsc.h
index d0e0bba2f886d31e2910b8eff09f6d8e9d7513f2..20c9d27b76f324f79f895966993cd92825350f19 100644 (file)
--- a/include/nsc.h
+++ b/include/nsc.h
@@ -131,7 +131,7 @@ typedef enum {
     NS_LIST,                   /* list of IDs */
     NS_DIST,                   /* circular area */
     NS_AREA,                   /* rectangular area */
-    NS_ALL,                    /* everything */
+    NS_EVERYTHING,             /* everything */
     NS_XY,                     /* one sector area */
     NS_GROUP                   /* group, i.e. fleet, wing, army */
 } ns_seltype;

diff --git a/src/lib/commands/tend.c b/src/lib/commands/tend.c
index c26387e3049f0548158efd8365f1e01ff4cdfec7..0d2c0b7530dbf0418b875c9f8d576a30e2e1cac0 100644 (file)
--- a/src/lib/commands/tend.c
+++ b/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_ALL:
-           /* XXX maybe combine NS_LIST and NS_ALL later */
+       case NS_EVERYTHING:
+           /* XXX maybe combine NS_LIST and NS_EVERYTHING later */
            break;
        case NS_DIST:
            if (!xyinrange(gp->x, gp->y, &np->range)) {

diff --git a/src/lib/subs/nxtitem.c b/src/lib/subs/nxtitem.c
index 6a719812c7646802a5b878643737dfc336bad3bb..c702c38d5f27368ec7cd97f98526ed32effc011b 100644 (file)
--- a/src/lib/subs/nxtitem.c
+++ b/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_ALL:
-           /* XXX maybe combine NS_LIST and NS_ALL later */
+       case NS_EVERYTHING:
+           /* XXX maybe combine NS_LIST and NS_EVERYTHING later */
            break;
        case NS_DIST:
            if (!xyinrange(gp->x, gp->y, &np->range)) {

diff --git a/src/lib/subs/sarg.c b/src/lib/subs/sarg.c
index 6b87aa5786d8ae44fb727046b4b42a1e531105f5..a0bf2b1e35173383ad1aaeb666e36cc8e76c1d4c 100644 (file)
--- a/src/lib/subs/sarg.c
+++ b/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_ALL
+ *  * --> NS_EVERYTHING
  *
  * or 0 for none of the above.
  */
@@ -61,7 +61,7 @@ sarg_type(char *str)
     if (c == '@')
        return NS_DIST;
     if (c == '*')
-       return NS_ALL;
+       return NS_EVERYTHING;
     if (c == '#' || strchr(str, ',') != 0)
        return NS_AREA;
     if (isdigit(c))

diff --git a/src/lib/subs/snxtitem.c b/src/lib/subs/snxtitem.c
index 1f1896a297d2c43d03efcb81d3f48fd38cb21742..e6b00cee73f05bb04203a55298761fbf4fcda7e4 100644 (file)
--- a/src/lib/subs/snxtitem.c
+++ b/src/lib/subs/snxtitem.c
@@ -40,7 +40,7 @@
 
 /*
  * setup the nstr structure for sector selection.
- * can select on NS_ALL, NS_AREA, NS_DIST, and NS_LIST.
+ * can select on NS_EVERYTHING, 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_ALL:
+    case NS_EVERYTHING:
        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_ALL;
+    np->sel = NS_EVERYTHING;
     np->type = type;
     np->index = -1;
     np->read = ef_read;

diff --git a/src/lib/subs/snxtsct.c b/src/lib/subs/snxtsct.c
index 5a03e9c66b4920a074b4955999783c6634a05689..a737d848342282d181868d6adccdf7799fc60850 100644 (file)
--- a/src/lib/subs/snxtsct.c
+++ b/src/lib/subs/snxtsct.c
@@ -41,7 +41,7 @@
 
 /*
  * setup the nstr_sect structure for sector selection.
- * can select on either NS_ALL, NS_AREA, or NS_RANGE
+ * can select on either NS_EVERYTHING, 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_ALL:
+    case NS_EVERYTHING:
        /* fake "all" by doing a world-sized area query */
        snxtsct_area(np, &wr);
        break;

diff --git a/src/lib/update/nxtitemp.c b/src/lib/update/nxtitemp.c
index b5ccbeddb63a29f1f108cd82d098f69e21e331fe..0b7015a96cdf6de58742e42edad3b9119cc764bf 100644 (file)
--- a/src/lib/update/nxtitemp.c
+++ b/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_ALL:
-           /* XXX maybe combine NS_LIST and NS_ALL later */
+       case NS_EVERYTHING:
+           /* XXX maybe combine NS_LIST and NS_EVERYTHING later */
            break;
        case NS_DIST:
            if (!xyinrange(gp->x, gp->y, &np->range)) {