Merge branch 'master' of /home/carl/git/libdcp

2 files changed, 4 insertions, 1 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,
diff --git a/wscript b/wscript
index 01fd4a7b..c5ceb102 100644
--- a/wscript
+++ b/wscript
@@ -2,7 +2,7 @@ import subprocess
 import os
 
 APPNAME = 'libdcp'
-VERSION = '0.46pre'
+VERSION = '0.47pre'
 
 def options(opt):
     opt.load('compiler_cxx')