From f76ef6ffc2caa72cbd6ab91ac0ca26207ca76999 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Sat, 8 Dec 2007 22:17:48 +0000
Subject: [PATCH] - Reverted the 'None' name change from r569.

SVN r585 (trunk)
---
 docs/rh-log.txt | 3 +++
 src/name.cpp    | 2 --
 src/name.h      | 2 --
 src/namedef.h   | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 1c11e0221..394cfd496 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,6 @@
+December 8, 2007
+- Reverted the 'None' name change from r569.
+
 December 6, 2007
 - Fixed the PowerTimeFreezer, too. It got easier once I realized that I only
   need to be concerned about changing the flag on odd tics, since A_Tracer()
diff --git a/src/name.cpp b/src/name.cpp
index f9e111742..b8a7d123e 100644
--- a/src/name.cpp
+++ b/src/name.cpp
@@ -71,10 +71,8 @@ FName::NameManager FName::NameData;
 static const char *PredefinedNames[] =
 {
 #define xx(n) #n,
-#define yy(n,s) s,
 #include "namedef.h"
 #undef xx
-#undef yy
 };
 
 // CODE --------------------------------------------------------------------
diff --git a/src/name.h b/src/name.h
index 01cc15409..fa161ab2e 100644
--- a/src/name.h
+++ b/src/name.h
@@ -37,10 +37,8 @@
 enum ENamedName
 {
 #define xx(n) NAME_##n,
-#define yy(n,s) NAME_##n,
 #include "namedef.h"
 #undef xx
-#undef yy
 };
 
 class FString;
diff --git a/src/namedef.h b/src/namedef.h
index 79b5a18e1..77ce6bafe 100644
--- a/src/namedef.h
+++ b/src/namedef.h
@@ -1,5 +1,5 @@
 // 'None' must always be the first name.
-yy(None, "")
+xx(None)
 
 xx(Super)
 xx(Object)