projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix duplicate name of _mutex in ExceptionStore and some of its children.
[dcpomatic.git]
/
src
/
lib
/
server.cc
diff --git
a/src/lib/server.cc
b/src/lib/server.cc
index 2fc9404669724c41ada2cd80391d121e57609b12..f9f91417848bd010112ffb4d1abee49089a63ec5 100644
(file)
--- a/
src/lib/server.cc
+++ b/
src/lib/server.cc
@@
-23,6
+23,7
@@
*/
#include "server.h"
*/
#include "server.h"
+#include "util.h"
#include "dcpomatic_socket.h"
#include "image.h"
#include "dcp_video.h"
#include "dcpomatic_socket.h"
#include "image.h"
#include "dcp_video.h"
@@
-33,7
+34,9
@@
#include "safe_stringstream.h"
#include "raw_convert.h"
#include "compose.hpp"
#include "safe_stringstream.h"
#include "raw_convert.h"
#include "compose.hpp"
+#include "log.h"
#include <libcxml/cxml.h>
#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
#include <boost/algorithm/string.hpp>
#include <boost/scoped_array.hpp>
#include <string>
#include <boost/algorithm/string.hpp>
#include <boost/scoped_array.hpp>
#include <string>