From df65ecaa343dc977857693b1719f3fe54a47e6d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Tue, 8 Jul 2014 14:53:17 -0700 Subject: [PATCH] fix compile errors --- common/headless_view.hpp | 4 ++-- src/util/io.cpp | 1 + test/headless.cpp | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/common/headless_view.hpp b/common/headless_view.hpp index a203d477e..b3e1c11b9 100644 --- a/common/headless_view.hpp +++ b/common/headless_view.hpp @@ -29,14 +29,14 @@ private: private: -#ifdef LLMR_USE_CGL +#if LLMR_USE_CGL CGLContextObj gl_context; GLuint fbo = 0; GLuint fbo_depth_stencil = 0; GLuint fbo_color = 0; #endif -#ifdef LLMR_USE_GLX +#if LLMR_USE_GLX GLXContext gl_context = nullptr; XVisualInfo *x_info = nullptr; Display *x_display = nullptr; diff --git a/src/util/io.cpp b/src/util/io.cpp index fb36998e0..1312b907b 100644 --- a/src/util/io.cpp +++ b/src/util/io.cpp @@ -4,6 +4,7 @@ #include #include #include +#include namespace llmr { namespace util { diff --git a/test/headless.cpp b/test/headless.cpp index 108d7627b..2428b1a2f 100644 --- a/test/headless.cpp +++ b/test/headless.cpp @@ -5,9 +5,10 @@ #include #include -#include "../common/headless_view.hpp" #include +#include "../common/headless_view.hpp" + const std::string base_directory = []{ std::string fn = __FILE__; fn.erase(fn.find_last_of("/"));