swaroop: build fixes.

diff --git a/src/lib/encrypted_ecinema_kdm.h b/src/lib/encrypted_ecinema_kdm.h
index decf9e9d521cd1f63b954474f1ab1c20862a4333..f459409fe6e71a69a5436b294716ab052f0fdada 100644 (file)
--- a/src/lib/encrypted_ecinema_kdm.h
+++ b/src/lib/encrypted_ecinema_kdm.h
@@ -20,6 +20,9 @@
 
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 
+#ifndef DCPOMATIC_ENCRYPTED_ECINEMA_KDM_H
+#define DCPOMATIC_ENCRYPTED_ECINEMA_KDM_H
+
 #include <dcp/key.h>
 #include <dcp/data.h>
 #include <dcp/certificate.h>
@@ -40,3 +43,5 @@ private:
 };
 
 #endif
+
+#endif

diff --git a/src/lib/state.h b/src/lib/state.h
index 251124a43ae8d8e5071d929fb86feb94f5e7592c..35a93f52d5d30239eca39b8de24e378f99911870 100644 (file)
--- a/src/lib/state.h
+++ b/src/lib/state.h
@@ -34,8 +34,6 @@ public:
 
        /** If set, this overrides the standard path (in home, Library, AppData or wherever) for config.xml, cinemas.xml etc. */
        static boost::optional<boost::filesystem::path> override_path;
-
-protected:
        static boost::filesystem::path path (std::string file, bool create_directories = true);
 };