From 9aec1c791a7669f19550e2dc299f898e57244a1f Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 11 Mar 2014 12:20:51 +0000
Subject: [PATCH] OS X build fixes.

---
 src/lib/cross.cc  | 7 +++++--
 src/lib/writer.cc | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 786f4b997..8785553cb 100644
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -310,8 +310,11 @@ Waker::nudge ()
 
 Waker::Waker ()
 {
-#ifdef DCPOMATIC_OSX	
-        IOPMAssertionCreateWithName (kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, CFSTR ("Encoding DCP"), &_assertion_id);
+#ifdef DCPOMATIC_OSX
+	/* We should use this */
+        // IOPMAssertionCreateWithName (kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, CFSTR ("Encoding DCP"), &_assertion_id);
+	/* but it's not available on 10.5, so we use this */
+        IOPMAssertionCreate (kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, &_assertion_id);
 #endif	
 }
 
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index f689ace7c..23f8bee97 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -40,6 +40,9 @@
 
 #include "i18n.h"
 
+/* OS X strikes again */
+#undef set_key
+
 using std::make_pair;
 using std::pair;
 using std::string;
-- 
2.30.2