projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use libdcp's warnings.h
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_disk_writer.cc
diff --git
a/src/tools/dcpomatic_disk_writer.cc
b/src/tools/dcpomatic_disk_writer.cc
index ef384bbbac5d27b2bd0967d98f3c9c818234ead3..627aacc86dea73ebb645649b1e9f7e0340abcb34 100644
(file)
--- a/
src/tools/dcpomatic_disk_writer.cc
+++ b/
src/tools/dcpomatic_disk_writer.cc
@@
-45,6
+45,7
@@
extern "C" {
#include <lwext4/file_dev.h>
}
extern "C" {
#include <lwext4/file_dev.h>
}
+#include <unistd.h>
#include <xpc/xpc.h>
#endif
#include <xpc/xpc.h>
#endif
@@
-59,9
+60,9
@@
extern "C" {
}
#endif
}
#endif
-
DCPOMATIC
_DISABLE_WARNINGS
+
LIBDCP
_DISABLE_WARNINGS
#include <glibmm.h>
#include <glibmm.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
#include <unistd.h>
#include <sys/types.h>
#include <unistd.h>
#include <sys/types.h>
@@
-285,7
+286,7
@@
main ()
* redirect this to a file in /var/log
*/
dcpomatic_log.reset(new StdoutLog(LogEntry::TYPE_DISK));
* redirect this to a file in /var/log
*/
dcpomatic_log.reset(new StdoutLog(LogEntry::TYPE_DISK));
- LOG_DISK("dcpomatic_disk_writer %1 started
", dcpomatic_git_commit
);
+ LOG_DISK("dcpomatic_disk_writer %1 started
uid=%2 euid=%3", dcpomatic_git_commit, getuid(), geteuid()
);
#else
/* XXX: this is a hack, but I expect we'll need logs and I'm not sure if there's
* a better place to put them.
#else
/* XXX: this is a hack, but I expect we'll need logs and I'm not sure if there's
* a better place to put them.