diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-08-12 12:53:46 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-08-12 12:53:46 +0100 |
| commit | 2bd3a2f185b4755c4a01ba5c34c1d3e1f78e5c97 (patch) | |
| tree | 2c28396e895557498720899b24a1273a43e2220e | |
| parent | 80cb87b94c1a6ddb814aed086bd077c1aed9ff7b (diff) | |
More build fixes.
| -rw-r--r-- | cscript | 2 | ||||
| -rw-r--r-- | src/lib/compose.hpp | 4 | ||||
| -rw-r--r-- | src/lib/log_entry.cc | 1 |
3 files changed, 6 insertions, 1 deletions
@@ -237,7 +237,7 @@ def dependencies(target): ffmpeg_options = {} return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options), - ('libdcp', '06a5d64'), + ('libdcp', 'eec238a'), ('libsub', '067c21c')) def configure_options(target): diff --git a/src/lib/compose.hpp b/src/lib/compose.hpp index b78a8b9eb..2d2294717 100644 --- a/src/lib/compose.hpp +++ b/src/lib/compose.hpp @@ -124,7 +124,11 @@ namespace StringPrivate inline void write(std::string& s, const int64_t& obj) { char buffer[64]; +#ifdef DCPOMATIC_WINDOWS + __mingw_snprintf(buffer, 64, "%" PRId64, obj); +#else snprintf(buffer, 64, "%" PRId64, obj); +#endif s += buffer; } diff --git a/src/lib/log_entry.cc b/src/lib/log_entry.cc index 18eed4894..8a6654811 100644 --- a/src/lib/log_entry.cc +++ b/src/lib/log_entry.cc @@ -20,6 +20,7 @@ #include "log_entry.h" #include <inttypes.h> +#include <cstdio> #include "i18n.h" |