diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-24 13:48:11 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-24 13:48:11 +0100 |
| commit | 228ecfd69716436578246f12db3139d0de32fce3 (patch) | |
| tree | 224b5830610cc2f6194681ef29f86c132e1c5e40 /src | |
| parent | f985e5e8cccaa44704d51dcfea3cc5042e22781f (diff) | |
| parent | 7836aa40bdde4354b2a816995faa09fa609917cf (diff) | |
Merge branch 'master' of /home/carl/git/libdcp
Diffstat (limited to 'src')
| -rw-r--r-- | src/types.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/types.h b/src/types.h index 3fcbd58f..b1de4a0f 100644 --- a/src/types.h +++ b/src/types.h @@ -109,6 +109,9 @@ struct EqualityOptions { bool mxf_names_can_differ; }; +/* Win32 defines this */ +#undef ERROR + enum NoteType { PROGRESS, ERROR, |