conflict in #define; closes #1

13 years ago · 3960ac4d19
parent b593a5d0b1
commit 3960ac4d19
2 changed files with 2 additions and 0 deletions
--- a/src/openssl-engine.hxx
+++ b/src/openssl-engine.hxx
@ -18,6 +18,7 @@
 #  define OPENSSL_V0_CONST const
 #endif

+#undef DATADIR
 #include <openssl/engine.h>
 #include <map>
 #include <string>
--- a/src/pcsc.hxx
+++ b/src/pcsc.hxx
@ -35,6 +35,7 @@

 #ifdef WIN32
  #undef UNICODE
+  #undef DATADIR
  #include <WinSCard.h>
  #undef ERROR
  #ifndef MAX_ATR_SIZE