Changeset 807
- Timestamp:
- 12/12/09 18:10:41 (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r806 r807 71 71 72 72 set (OPTIONAL_LINK_DIR "" CACHE STRING "Some optional link directories") 73 set (OPTIONAL_INCLUDE_DIR " /usr/include/PCSC" CACHE STRING "Some optional include directories")73 set (OPTIONAL_INCLUDE_DIR "" CACHE STRING "Some optional include directories") 74 74 75 75 include_directories ( … … 145 145 if (HAVE_PCSC) 146 146 add_definitions ("-DHAVE_PCSC") 147 if (OSCamOperatingSystem MATCHES "Linux") 148 add_definitions ("-I/usr/include/PCSC") 149 endif (OSCamOperatingSystem MATCHES "Linux") 147 150 endif (HAVE_PCSC) 148 151 -
trunk/reader-common.c
r802 r807 71 71 #ifdef HAVE_PCSC 72 72 if (reader[ridx].typ == R_PCSC) { 73 LONG rv;73 ULONG rv; 74 74 SCARD_IO_REQUEST pioRecvPci; 75 75 DWORD dwSendLength, dwRecvLength; … … 157 157 if (reader[ridx].typ == R_PCSC) { 158 158 cs_debug("PCSC initializing card in (%s)", &reader[ridx].pcsc_name); 159 LONG rv;159 ULONG rv; 160 160 DWORD dwState, dwAtrLen, dwReaderLen; 161 161 BYTE pbAtr[64]; … … 368 368 DWORD dwState, dwAtrLen, dwReaderLen; 369 369 BYTE pbAtr[64]; 370 LONG rv;370 ULONG rv; 371 371 372 372 dwAtrLen = sizeof(pbAtr); … … 427 427 #ifdef HAVE_PCSC 428 428 if (reader[ridx].typ == R_PCSC) { 429 LONG rv;429 ULONG rv; 430 430 DWORD dwReaders; 431 431 LPSTR mszReaders = NULL;
Note:
See TracChangeset
for help on using the changeset viewer.