X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcross_common.cc;h=e8c209b21e098f8da981bd5676af55c0c00b65ab;hp=9f42610bdc8acc53069467bb8ba9f1821aea7c47;hb=c103d8c1306e5fb3937b3a6c430a3fff32653fa3;hpb=46b0a3c2c8fa25b9881c4ae64a42682959464217

diff --git a/src/lib/cross_common.cc b/src/lib/cross_common.cc
index 9f42610bd..e8c209b21 100644
--- a/src/lib/cross_common.cc
+++ b/src/lib/cross_common.cc
@@ -23,11 +23,11 @@
 #include "compose.hpp"
 #include "dcpomatic_assert.h"
 #include "dcpomatic_log.h"
-#include "warnings.h"
 #include <dcp/raw_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #include <iostream>
 
@@ -156,7 +156,7 @@ analyse_osx_media_path (string path)
 }
 
 
-/* Take soem OSXDisk objects, representing disks that `DARegisterDiskAppearedCallback` told us about,
+/* Take some OSXDisk objects, representing disks that `DARegisterDiskAppearedCallback` told us about,
  * and find those drives that we could write a DCP to.  The drives returned are "real" (not synthesized)
  * and are whole disks (not partitions).  They may be mounted, or contain mounted partitions, in which
  * their mounted() method will return true.