OS X build fixes.

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 786f4b99767e1a8db5b4b1fc1f01695da547a919..8785553cbe32ccfc3f35656739f6b22432eab374 100644 (file)
--- 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 f689ace7c633aa6a47a42cf223d710c1b458b32b..23f8bee97d487b5a018f4e0eed6f3922da3f407d 100644 (file)
--- 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;