From f716939956e0da16d20b18ea63b5a49b4038da15 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 13 Sep 2014 05:15:05 -0400
Subject: Add vld_ prefix for vldoor_e enum values.

It was pointed out to me recently that vldoor_e has enum values
named 'open' and 'close'. These can potentially conflict with POSIX
standard functions that have the same names, if the right header
files are included.

This doesn't currently cause any problems. However, to avoid any
possibility of a conflict occurring if a different compiler is used,
add a vld_ prefix to all the enum values, to namespace them.
---
 src/strife/p_inter.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/strife/p_inter.c')

diff --git a/src/strife/p_inter.c b/src/strife/p_inter.c
index d691947e..857f4e13 100644
--- a/src/strife/p_inter.c
+++ b/src/strife/p_inter.c
@@ -939,7 +939,7 @@ void P_KillMobj(mobj_t* source, mobj_t* target)
 
         case MT_COUPLING:
             junk.tag = 225;
-            EV_DoDoor(&junk, close);
+            EV_DoDoor(&junk, vld_close);
 
             junk.tag = 44;
             EV_DoFloor(&junk, lowerFloor);
@@ -960,7 +960,7 @@ void P_KillMobj(mobj_t* source, mobj_t* target)
     {
     case MT_TOKEN_SHOPCLOSE:
         junk.tag = 222;
-        EV_DoDoor(&junk, close);
+        EV_DoDoor(&junk, vld_close);
         P_NoiseAlert(players[0].mo, players[0].mo);
 
         M_snprintf(plrkilledmsg, sizeof(plrkilledmsg),
@@ -972,12 +972,12 @@ void P_KillMobj(mobj_t* source, mobj_t* target)
 
     case MT_TOKEN_PRISON_PASS:
         junk.tag = 223;
-        EV_DoDoor(&junk, open);
+        EV_DoDoor(&junk, vld_open);
         return;
 
     case MT_TOKEN_DOOR3:
         junk.tag = 224;
-        EV_DoDoor(&junk, open);
+        EV_DoDoor(&junk, vld_open);
         return;
 
     case MT_SIGIL_A:
-- 
cgit v1.2.3