summaryrefslogtreecommitdiff
path: root/src/heretic/p_spec.h
diff options
context:
space:
mode:
authorSimon Howard2014-09-13 05:15:05 -0400
committerSimon Howard2014-09-13 05:15:05 -0400
commitf716939956e0da16d20b18ea63b5a49b4038da15 (patch)
treee0629bc70f6b822151a8267db49d6299d0c9c85d /src/heretic/p_spec.h
parentcb72358ee930b29f4840b04bbb81f8d8444ce481 (diff)
downloadchocolate-doom-f716939956e0da16d20b18ea63b5a49b4038da15.tar.gz
chocolate-doom-f716939956e0da16d20b18ea63b5a49b4038da15.tar.bz2
chocolate-doom-f716939956e0da16d20b18ea63b5a49b4038da15.zip
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.
Diffstat (limited to 'src/heretic/p_spec.h')
-rw-r--r--src/heretic/p_spec.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/heretic/p_spec.h b/src/heretic/p_spec.h
index 2de14b18..b26244af 100644
--- a/src/heretic/p_spec.h
+++ b/src/heretic/p_spec.h
@@ -253,11 +253,11 @@ void P_ActivateInStasis(int tag);
*/
typedef enum
{
- normal,
- close30ThenOpen,
- close,
- open,
- raiseIn5Mins
+ vld_normal,
+ vld_close30ThenOpen,
+ vld_close,
+ vld_open,
+ vld_raiseIn5Mins
} vldoor_e;
typedef struct