From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Thu, 15 Jan 2015 21:47:29 +0000 (+0100)
Subject: Check for __APPLE__ instead of __DARWIN__.
X-Git-Tag: 1.1.3~17
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=95edbfccb0843da3cc105dadc5bc6d8e102f6071

Check for __APPLE__ instead of __DARWIN__.

Fixes compile with recent epoxy. Bug report and suggestion
by Dan Dennedy.
---

diff --git a/util.cpp b/util.cpp
index 01787f0..579efb3 100644
--- a/util.cpp
+++ b/util.cpp
@@ -9,7 +9,7 @@
 #include "init.h"
 #include "util.h"
 
-#if defined(__DARWIN__)
+#if defined(__APPLE__)
 #include <OpenGL/OpenGL.h>
 #elif defined(WIN32)
 #include <epoxy/wgl.h>
@@ -256,7 +256,7 @@ unsigned next_power_of_two(unsigned v)
 
 void *get_gl_context_identifier()
 {
-#if defined(__DARWIN__)
+#if defined(__APPLE__)
 	return (void *)CGLGetCurrentContext();
 #elif defined(WIN32)
 	return (void *)wglGetCurrentContext();