projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge changelog.
[dcpomatic.git]
/
src
/
lib
/
util.cc
diff --git
a/src/lib/util.cc
b/src/lib/util.cc
index ae3de2d6b1e68b1ef5a31022bd62f17cc262420a..e0495f18b495e5e16eb0e828e8318f765d455aa9 100644
(file)
--- a/
src/lib/util.cc
+++ b/
src/lib/util.cc
@@
-65,6
+65,7
@@
extern "C" {
#include "config.h"
#include "ratio.h"
#include "job.h"
#include "config.h"
#include "ratio.h"
#include "job.h"
+#include "cross.h"
#ifdef DCPOMATIC_WINDOWS
#include "stack.hpp"
#endif
#ifdef DCPOMATIC_WINDOWS
#include "stack.hpp"
#endif
@@
-824,7
+825,7
@@
make_signer ()
{
boost::filesystem::path const sd = Config::instance()->signer_chain_directory ();
if (boost::filesystem::is_empty (sd)) {
{
boost::filesystem::path const sd = Config::instance()->signer_chain_directory ();
if (boost::filesystem::is_empty (sd)) {
- libdcp::make_signer_chain (sd);
+ libdcp::make_signer_chain (sd
, openssl_path ()
);
}
libdcp::CertificateChain chain;
}
libdcp::CertificateChain chain;