libraries/libpcscxx
1
0
Fork 0
Code Issues Releases Activity

conflict in #define; closes #1

Browse Source
This commit is contained in:
Marc Wäckerlin
2011-11-10 13:28:18 +00:00
parent b593a5d0b1
commit 3960ac4d19
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/openssl-engine.hxx
View File

@@ -18,6 +18,7 @@
# define OPENSSL_V0_CONST const # define OPENSSL_V0_CONST const
#endif #endif
#undef DATADIR
#include <openssl/engine.h> #include <openssl/engine.h>
#include <map> #include <map>
#include <string> #include <string>

1
src/pcsc.hxx
View File

@@ -35,6 +35,7 @@
#ifdef WIN32 #ifdef WIN32
#undef UNICODE #undef UNICODE
#undef DATADIR
#include <WinSCard.h> #include <WinSCard.h>
#undef ERROR #undef ERROR
#ifndef MAX_ATR_SIZE #ifndef MAX_ATR_SIZE