From 3960ac4d194aa9c6d68f2ea8c237eb32bf473bb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 10 Nov 2011 13:28:18 +0000
Subject: [PATCH] conflict in #define; closes #1

---
 src/openssl-engine.hxx | 1 +
 src/pcsc.hxx           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/openssl-engine.hxx b/src/openssl-engine.hxx
index e7b8e9b..adff922 100644
--- 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>
diff --git a/src/pcsc.hxx b/src/pcsc.hxx
index 6fedac0..1c2c4ae 100644
--- 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