From 6adcba3c4b46a1762ee753467551cad64727bd4d Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@users.noreply.github.com>
Date: Wed, 7 Dec 2016 18:39:09 +0100
Subject: [PATCH] - fixed linkage for fuzzviewheight - fixed naming conflict
 with GCC's virtual table.

---
 src/r_draw_pal.cpp | 4 ++--
 src/r_draw_pal.h   | 2 +-
 src/r_main.cpp     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/r_draw_pal.cpp b/src/r_draw_pal.cpp
index b508dd221c..cfb55a6706 100644
--- a/src/r_draw_pal.cpp
+++ b/src/r_draw_pal.cpp
@@ -2564,7 +2564,7 @@ namespace swrenderer
 	/////////////////////////////////////////////////////////////////////////
 
 	DrawSlabPalCommand::DrawSlabPalCommand(int dx, fixed_t v, int dy, fixed_t vi, const uint8_t *vptr, uint8_t *p, const uint8_t *colormap)
-		: _dx(dx), _v(v), _dy(dy), _vi(vi), _vptr(vptr), _p(p), _colormap(colormap)
+		: _dx(dx), _v(v), _dy(dy), _vi(vi), _vvptr(vptr), _p(p), _colormap(colormap)
 	{
 		using namespace drawerargs;
 		_pitch = dc_pitch;
@@ -2578,7 +2578,7 @@ namespace swrenderer
 		int pitch = _pitch;
 		int width = _dx;
 		const uint8_t *colormap = _colormap;
-		const uint8_t *source = _vptr;
+		const uint8_t *source = _vvptr;
 		fixed_t fracpos = _v;
 		fixed_t iscale = _vi;
 
diff --git a/src/r_draw_pal.h b/src/r_draw_pal.h
index a2400d2759..f2b1f05712 100644
--- a/src/r_draw_pal.h
+++ b/src/r_draw_pal.h
@@ -230,7 +230,7 @@ namespace swrenderer
 		fixed_t _v;
 		int _dy;
 		fixed_t _vi;
-		const uint8_t *_vptr;
+		const uint8_t *_vvptr;
 		uint8_t *_p;
 		const uint8_t *_colormap;
 		int _pitch;
diff --git a/src/r_main.cpp b/src/r_main.cpp
index 0ee075140d..4bf15d4b99 100644
--- a/src/r_main.cpp
+++ b/src/r_main.cpp
@@ -118,7 +118,7 @@ static void R_ShutdownRenderer();
 
 extern short *openings;
 extern bool r_fakingunderwater;
-extern "C" int fuzzviewheight;
+extern int fuzzviewheight;
 extern subsector_t *InSubsector;