Merge master.

[libdcp.git] / src / mxf.h

diff --git a/src/mxf.h b/src/mxf.h
index 48a1f64ea6c553e9fbcc020a0d3e1f849a08fa49..c5ecd1b74f18cc22cfca7df9325347c4bb6838cd 100644 (file)
--- a/src/mxf.h
+++ b/src/mxf.h
@@ -30,6 +30,10 @@ namespace ASDCP {
        class AESDecContext;
 }
 
+/* Undefine some stuff that the OS X 10.5 SDK defines */
+#undef Key
+#undef set_key
+
 namespace dcp
 {