From 283b26114c2341184965887c1cf1c4189b0166b1 Mon Sep 17 00:00:00 2001 From: James Turner Date: Sat, 1 Oct 2011 10:05:01 +0100 Subject: [PATCH] Fix glx shutdown to only apply on Unix & !Mac (but we should really add a proper ifdef for GLX) --- src/GUI/new_gui.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/GUI/new_gui.cxx b/src/GUI/new_gui.cxx index ce4c7237d..b8834fdca 100644 --- a/src/GUI/new_gui.cxx +++ b/src/GUI/new_gui.cxx @@ -22,7 +22,7 @@ #include
-#ifndef _WIN32 +#if defined(SG_UNIX) && !defined(SG_MAC) #include "GL/glx.h" #endif @@ -421,7 +421,7 @@ FGFontCache::FGFontCache() : FGFontCache::~FGFontCache() { -#ifndef _WIN32 +#if defined(SG_UNIX) && !defined(SG_MAC) // Ugly workaround for a crash on exit with multiple screens configured if (!glXGetCurrentContext()) return; -- 2.39.5