diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-04-22 23:27:15 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-04-22 23:27:15 +0200 |
| commit | 3c29aa6531a4046a8db72dcac81189eb8893233c (patch) | |
| tree | ce2a134dab63df1711a135ae5732839ff293d958 /src/tools/dcpomatic_server.cc | |
| parent | 92364afecf76a87e1f96980cb1b91cf6f6a7522c (diff) | |
Use libdcp's warnings.h
Diffstat (limited to 'src/tools/dcpomatic_server.cc')
| -rw-r--r-- | src/tools/dcpomatic_server.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index de25f531d..6cf0a9609 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -29,16 +29,17 @@ #include "lib/signaller.h" #include "lib/cross.h" #include "lib/dcpomatic_log.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS -#include <wx/taskbar.h> -#include <wx/splash.h> +#include <dcp/warnings.h> +LIBDCP_DISABLE_WARNINGS #include <wx/icon.h> -DCPOMATIC_ENABLE_WARNINGS +#include <wx/splash.h> +#include <wx/taskbar.h> +LIBDCP_ENABLE_WARNINGS #include <boost/thread.hpp> #include <boost/optional.hpp> #include <iostream> + using std::cout; using std::string; using std::exception; @@ -54,6 +55,7 @@ using std::dynamic_pointer_cast; using namespace boost::placeholders; #endif + enum { ID_status = 1, ID_quit, |