X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcross_osx.cc;h=b214b6359767b21749095b5f83a06b3466fe6ff8;hp=2dc9b2702b006044f8d384e450f6877753ccc4c3;hb=8a8c977c12fc65f1f50ea05099387e0fc8840e7d;hpb=9b9202c7f9fc26fcef0984189aaed366b7c6d726

diff --git a/src/lib/cross_osx.cc b/src/lib/cross_osx.cc
index 2dc9b2702..b214b6359 100644
--- a/src/lib/cross_osx.cc
+++ b/src/lib/cross_osx.cc
@@ -25,7 +25,6 @@
 #include "dcpomatic_log.h"
 #include "config.h"
 #include "exceptions.h"
-#include "warnings.h"
 #include <dcp/raw_convert.h>
 #include <glib.h>
 extern "C" {
@@ -58,7 +57,6 @@ using std::pair;
 using std::list;
 using std::ifstream;
 using std::string;
-using std::wstring;
 using std::make_pair;
 using std::vector;
 using std::cerr;
@@ -116,16 +114,9 @@ resources_path ()
 
 
 boost::filesystem::path
-xsd_path ()
+libdcp_resources_path ()
 {
-	return resources_path() / "xsd";
-}
-
-
-boost::filesystem::path
-tags_path ()
-{
-	return resources_path() / "tags";
+	return resources_path();
 }
 
 
@@ -165,24 +156,6 @@ disk_writer_path ()
 #endif
 
 
-/* Apparently there is no way to create an ofstream using a UTF-8
-   filename under Windows.  We are hence reduced to using fopen
-   with this wrapper.
-*/
-FILE *
-fopen_boost (boost::filesystem::path p, string t)
-{
-        return fopen (p.c_str(), t.c_str());
-}
-
-
-int
-dcpomatic_fseek (FILE* stream, int64_t offset, int whence)
-{
-	return fseek (stream, offset, whence);
-}
-
-
 void
 Waker::nudge ()
 {
@@ -535,9 +508,9 @@ void
 make_foreground_application ()
 {
 	ProcessSerialNumber serial;
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 	GetCurrentProcess (&serial);
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 	TransformProcessType (&serial, kProcessTransformToForegroundApplication);
 }
 
@@ -549,13 +522,6 @@ dcpomatic::get_process_id ()
 }
 
 
-boost::filesystem::path
-fix_long_path (boost::filesystem::path path)
-{
-	return path;
-}
-
-
 bool
 show_in_file_manager (boost::filesystem::path, boost::filesystem::path select)
 {