[Linux] Compile errors error: redeclaration of ‘SKYBOX_PLANE

[rcampbel3]

Ubuntu 14.04 64-bit - latest source from Feb 15,. 2016

[ 38%] Building CXX object src/CMakeFiles/zdoom.dir/r_bsp.cpp.o
In file included from /home/rcampbel/project/gzdoom_build/gzdoom/src/r_bsp.cpp:56:0:
/home/rcampbel/project/gzdoom_build/gzdoom/src/r_sky.h:30:2: error: redeclaration of ‘SKYBOX_PLANE’
SKYBOX_PLANE,
^
In file included from /home/rcampbel/project/gzdoom_build/gzdoom/src/r_state.h:28:0,
from /home/rcampbel/project/gzdoom_build/gzdoom/src/r_utility.h:4,
from /home/rcampbel/project/gzdoom_build/gzdoom/src/r_main.h:26,
from /home/rcampbel/project/gzdoom_build/gzdoom/src/r_bsp.cpp:41:
/home/rcampbel/project/gzdoom_build/gzdoom/src/r_defs.h:70:2: note: previous declaration ‘<anonymous enum> SKYBOX_PLANE’
SKYBOX_PLANE, // EE-style plane portal (not implemented in SW renderer)
^
In file included from /home/rcampbel/project/gzdoom_build/gzdoom/src/r_bsp.cpp:56:0:
/home/rcampbel/project/gzdoom_build/gzdoom/src/r_sky.h:31:2: error: redeclaration of ‘SKYBOX_HORIZON’
SKYBOX_HORIZON
^
In file included from /home/rcampbel/project/gzdoom_build/gzdoom/src/r_state.h:28:0,
from /home/rcampbel/project/gzdoom_build/gzdoom/src/r_utility.h:4,
from /home/rcampbel/project/gzdoom_build/gzdoom/src/r_main.h:26,
from /home/rcampbel/project/gzdoom_build/gzdoom/src/r_bsp.cpp:41:
/home/rcampbel/project/gzdoom_build/gzdoom/src/r_defs.h:71:2: note: previous declaration ‘<anonymous enum> SKYBOX_HORIZON’
SKYBOX_HORIZON, // EE-style horizon portal (not implemented in SW renderer)
^
make[2]: *** [src/CMakeFiles/zdoom.dir/r_bsp.cpp.o] Error 1
make[1]: *** [src/CMakeFiles/zdoom.dir/all] Error 2
make: *** [all] Error 2

[Graf Zahl]

Already fixed.
This was caused by a bad git merge, btw.