From ddf58b43c984384ff4284c8a63b9a9eeb3770c0a Mon Sep 17 00:00:00 2001 From: Ralgor Date: Sun, 14 Sep 2014 14:28:05 -0500 Subject: [PATCH] Fix compile errors on linux. --- src/gl/textures/gl_texture.cpp | 2 +- src/gl/utility/gl_clock.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gl/textures/gl_texture.cpp b/src/gl/textures/gl_texture.cpp index b737ced77..838510bcd 100644 --- a/src/gl/textures/gl_texture.cpp +++ b/src/gl/textures/gl_texture.cpp @@ -814,7 +814,7 @@ CCMD(textureinfo) if (tex->gl_info.SystemTexture[0] || tex->gl_info.SystemTexture[1] || tex->gl_info.Material[0] || tex->gl_info.Material[1]) { int lump = tex->GetSourceLump(); - Printf(PRINT_LOG, "Texture '%s' (Index %d, Lump %d, Name '%s'):\n", tex->Name, i, lump, Wads.GetLumpFullName(lump)); + Printf(PRINT_LOG, "Texture '%s' (Index %d, Lump %d, Name '%s'):\n", (const char*)(tex->Name), i, lump, Wads.GetLumpFullName(lump)); if (tex->gl_info.Material[0]) { Printf(PRINT_LOG, "in use (normal)\n"); diff --git a/src/gl/utility/gl_clock.h b/src/gl/utility/gl_clock.h index f12cf1ef9..46a01d1e4 100644 --- a/src/gl/utility/gl_clock.h +++ b/src/gl/utility/gl_clock.h @@ -5,12 +5,12 @@ #include "x86.h" #include "m_fixed.h" +extern bool gl_benching; + #ifdef _MSC_VER extern double gl_SecondsPerCycle; extern double gl_MillisecPerCycle; -extern bool gl_benching; - __forceinline long long GetClockCycle () {