diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-05-01 09:27:04 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-05-13 11:07:46 +0100 |
| commit | 19a4388397813392d11dce07e4453c9b798b8bdb (patch) | |
| tree | 03dba3dc94c8021f0c429e9eaa6e6b3afb24252a /src/lib | |
| parent | 63bab3a5f4abc7c5ef8562f3048b55cb3a24c71f (diff) | |
swaroop: build fixes.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/encrypted_ecinema_kdm.h | 5 | ||||
| -rw-r--r-- | 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); }; |