From d90b40909bb4fa5fb45200a54a49d1b634dae94a Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Wed, 15 Jul 2015 13:02:54 +0200
Subject: [PATCH] - removed leftover #ifdef from a badly resolved merge
 conflict.

---
 src/p_3dfloors.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/p_3dfloors.cpp b/src/p_3dfloors.cpp
index 285c85f1a..d5ef77709 100644
--- a/src/p_3dfloors.cpp
+++ b/src/p_3dfloors.cpp
@@ -44,7 +44,6 @@
 #include "p_terrain.h"
 #include "r_data/colormaps.h"
 
-#ifdef _3DFLOORS
 EXTERN_CVAR(Int, vid_renderer)
 
 //==========================================================================