projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop using static initialisation so that dcpomatic::write() can be called more than...
[dcpomatic.git]
/
src
/
lib
/
spl.cc
diff --git
a/src/lib/spl.cc
b/src/lib/spl.cc
index 8d0dcc6fc76df26b74e702adb1a8c14e8cf7f9d9..3e5e957ff457792257e37c243add266e2feb4524 100644
(file)
--- a/
src/lib/spl.cc
+++ b/
src/lib/spl.cc
@@
-21,12
+21,12
@@
#include "content_store.h"
#include "spl.h"
#include "content_store.h"
#include "spl.h"
-#include "warnings.h"
#include <libcxml/cxml.h>
#include <dcp/raw_convert.h>
#include <libcxml/cxml.h>
#include <dcp/raw_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
#include <libxml++/libxml++.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
#include <iostream>
#include <iostream>