More win32 build hacks.

diff --git a/src/certificates.h b/src/certificates.h
index 42ae8d27b3e8424f5b5d3c0f8d4092e66946d200..9caea5a786cd8e8a15e1acde2c8c48922c27079d 100644 (file)
--- a/src/certificates.h
+++ b/src/certificates.h
@@ -24,6 +24,7 @@
 #include <list>
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
+#undef X509_NAME
 #include <openssl/x509.h>
 
 class certificates;

diff --git a/wscript b/wscript
index 27ce8c7fb249b275ba9b0cc0bf23f814d3a234ff..5fab91779312eb175c81c2ccb05c29e5e47c03f6 100644 (file)
--- a/wscript
+++ b/wscript
@@ -22,7 +22,7 @@ def configure(conf):
     conf.env.ENABLE_DEBUG = conf.options.enable_debug
 
     if conf.options.target_windows:
-        conf.env.append_value('CXXFLAGS', ['-DLIBDCP_WINDOWS', '-DOPENSSL_SYS_WIN32'])
+        conf.env.append_value('CXXFLAGS', '-DLIBDCP_WINDOWS')
     else:
         conf.env.append_value('CXXFLAGS', '-DLIBDCP_POSIX')