From 19a4388397813392d11dce07e4453c9b798b8bdb Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 1 May 2019 09:27:04 +0100
Subject: [PATCH] swaroop: build fixes.

---
 src/lib/encrypted_ecinema_kdm.h | 5 +++++
 src/lib/state.h                 | 2 --
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/lib/encrypted_ecinema_kdm.h b/src/lib/encrypted_ecinema_kdm.h
index decf9e9d5..f459409fe 100644
--- 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 251124a43..35a93f52d 100644
--- 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);
 };
 
-- 
2.30.2