[Pyscard-devel] SF.net SVN: pyscard:[203] trunk/pyscard/src/smartcard/scard

[<jda...@us...>]

Revision: 203
          http://pyscard.svn.sourceforge.net/pyscard/?rev=203&view=rev
Author:   jdaussel
Date:     2008-08-01 13:53:08 +0000 (Fri, 01 Aug 2008)

Log Message:
-----------
Fixed issue with ScardControl renamed SCardControl132 on Mac OS X Leopard

Modified Paths:
--------------
    trunk/pyscard/src/smartcard/scard/gemalto.ver
    trunk/pyscard/src/smartcard/scard/winscarddll.c

Modified: trunk/pyscard/src/smartcard/scard/gemalto.ver
===================================================================
--- trunk/pyscard/src/smartcard/scard/gemalto.ver	2008-04-10 11:31:50 UTC (rev 202)
+++ trunk/pyscard/src/smartcard/scard/gemalto.ver	2008-08-01 13:53:08 UTC (rev 203)
@@ -24,7 +24,7 @@
 #endif
 
 #ifndef VER_PRODUCTVERSION_STR
-#define VER_PRODUCTVERSION_STR "1.6.6"
+#define VER_PRODUCTVERSION_STR "1.6.7"
 #endif
 
 #ifndef VER_FILEFLAGSMASK

Modified: trunk/pyscard/src/smartcard/scard/winscarddll.c
===================================================================
--- trunk/pyscard/src/smartcard/scard/winscarddll.c	2008-04-10 11:31:50 UTC (rev 202)
+++ trunk/pyscard/src/smartcard/scard/winscarddll.c	2008-08-01 13:53:08 UTC (rev 203)
@@ -561,8 +561,17 @@
                 GETPROCADDRESS( SCARDRELEASECONTEXT    , SCardReleaseContext    , SCardReleaseContext    );
                 GETPROCADDRESS( SCARDSTATUSA           , SCardStatusA           , SCardStatus            );
                 GETPROCADDRESS( SCARDTRANSMIT          , SCardTransmit          , SCardTransmit          );
-                GETPROCADDRESS( SCARDCONTROL           , SCardControl           , SCardControl );
 
+                #ifndef __APPLE__
+                    GETPROCADDRESS( SCARDCONTROL, SCardControl, SCardControl );
+                #else // !__APPLE__
+                    #ifdef __TIGER__
+                        GETPROCADDRESS( SCARDCONTROL, SCardControl, SCardControl );
+                    #else // ! __TIGER__
+                        GETPROCADDRESS( SCARDCONTROL, SCardControl, SCardControl132 );
+                    #endif // __TIGER__
+                #endif // __APPLE__
+
                 #ifndef __TIGER__
                     SILENTGETPROCADDRESS( SCARDISVALIDCONTEXT    , SCardIsValidContext    , SCardIsValidContext    );
                     GETPROCADDRESS( SCARDGETATTRIB         , SCardGetAttrib         , SCardGetAttrib         );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.