diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-11 23:12:48 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-11 23:12:48 +0100 |
| commit | 1374212e0c1e69ba92a023605c4a8dc4400913b9 (patch) | |
| tree | f95f3a90852f982b2f8f4825d32141ba3e5c6d4b | |
| parent | 8374d7f67a287a8ee94a9baa39d847bc80f8be27 (diff) | |
| parent | f38478e5d225ac6b35b74a0daf0a1fdb2e3d6f37 (diff) | |
Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/libdcp
| -rw-r--r-- | src/certificates.h | 4 | ||||
| -rw-r--r-- | src/crypt_chain.cc | 4 | ||||
| -rw-r--r-- | wscript | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/certificates.h b/src/certificates.h index 06baa547..9caea5a7 100644 --- a/src/certificates.h +++ b/src/certificates.h @@ -24,9 +24,7 @@ #include <list> #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> -#ifdef LIBDCP_WINDOWS -#include "wincrypt.h" -#endif +#undef X509_NAME #include <openssl/x509.h> class certificates; diff --git a/src/crypt_chain.cc b/src/crypt_chain.cc index ee1b2486..d495c970 100644 --- a/src/crypt_chain.cc +++ b/src/crypt_chain.cc @@ -33,7 +33,11 @@ using std::cout; static void command (char const * c) { int const r = system (c); +#ifdef LIBDCP_WINDOWS if (r) { +#else + if (WEXITSTATUS (r)) { +#endif stringstream s; s << "error in " << c << "\n"; throw libdcp::MiscError (s.str()); @@ -2,7 +2,7 @@ import subprocess import os APPNAME = 'libdcp' -VERSION = '0.61pre' +VERSION = '0.65pre' def options(opt): opt.load('compiler_cxx') |