Renamed UNDEFINED to UNDEFINED_VALUE.

diff --git a/include/hack.h b/include/hack.h
index 3525e1695e40215c73fd6122116e2a4d0f752c07..fd38f5b3035af8cc6a9cc38b7f466f01557f808f 100644 (file)
--- a/include/hack.h
+++ b/include/hack.h
@@ -22,11 +22,11 @@
         0     \
     }
 
-/* UNDEFINED and UNDEFINED_PTR are used to initialize variables whose
-   initialized value is not relied upon.  UNDEFINED can be used to
+/* UNDEFINED_VALUE and UNDEFINED_PTR are used to initialize variables whose
+   initialized value is not relied upon.  UNDEFINED_VALUE can be used to
    initialized any value type except pointers.  UNDEFINED_PTR can be used
    only on pointer types. */
-#define UNDEFINED { 0 }
+#define UNDEFINED_VALUE { 0 }
 #define UNDEFINED_PTR NULL
 
 /* symbolic names for capacity levels */

diff --git a/src/decl.c b/src/decl.c
index 559969c395006fdba537b8997345127781a92cbf..3214faab106ef607fbdca9c6f3d2a2350e84aa24 100644 (file)
--- a/src/decl.c
+++ b/src/decl.c
@@ -345,10 +345,10 @@ const struct instance_globals g_init = {
     /* rumors.c */
     0, /* true_rumor_size */
     0, /* false_rumor_size */
-    UNDEFINED, /* true_rumor_start*/
-    UNDEFINED, /* false_rumor_start*/
-    UNDEFINED, /* true_rumor_end */
-    UNDEFINED, /* false_rumor_end */
+    UNDEFINED_VALUE, /* true_rumor_start*/
+    UNDEFINED_VALUE, /* false_rumor_start*/
+    UNDEFINED_VALUE, /* true_rumor_end */
+    UNDEFINED_VALUE, /* false_rumor_end */
     0, /* oracle_flag */
     0, /* oracle_cnt */
     NULL, /* oracle_loc */
@@ -364,12 +364,12 @@ const struct instance_globals g_init = {
     STRANGE_OBJECT, /* nocreate3 */
     STRANGE_OBJECT, /* nocreate4 */
     /* uhitm.c */
-    UNDEFINED, /* override_confirmation */
+    UNDEFINED_VALUE, /* override_confirmation */
     /* weapon.c */
     UNDEFINED_PTR, /* propellor */
     /* zap.c */
-    UNDEFINED, /* poly_zap */
-    UNDEFINED,  /* obj_zapped */
+    UNDEFINED_VALUE, /* poly_zap */
+    UNDEFINED_VALUE,  /* obj_zapped */
 
     IVMAGIC  /* used to validate that structure layout has been preserved */
 };

diff --git a/src/role.c b/src/role.c
index b61babf7c8ce2a4ba03db1504cc6d62926bd297b..b5aae50688ce1d560e5313695d6b81f4d4aac189 100644 (file)
--- a/src/role.c
+++ b/src/role.c
@@ -769,7 +769,7 @@ const struct Align aligns[] = {
 static struct {
     boolean roles[SIZE(roles)];
     short mask;
-} rfilter = UNDEFINED;
+} rfilter = UNDEFINED_VALUE;
 
 STATIC_DCL int NDECL(randrole_filtered);
 STATIC_DCL char *FDECL(promptsep, (char *, int));