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

[<lu...@us...>]

Revision: 247
          http://pyscard.svn.sourceforge.net/pyscard/?rev=247&view=rev
Author:   ludov
Date:     2009-01-09 19:28:14 +0000 (Fri, 09 Jan 2009)

Log Message:
-----------
SCard error values are of type DWORD (unsigned long) on Windows and
Linux but int32_t on Mac OS X

Modified Paths:
--------------
    trunk/pyscard/src/smartcard/scard/PcscDefs.i

Modified: trunk/pyscard/src/smartcard/scard/PcscDefs.i
===================================================================
--- trunk/pyscard/src/smartcard/scard/PcscDefs.i	2009-01-09 14:13:45 UTC (rev 246)
+++ trunk/pyscard/src/smartcard/scard/PcscDefs.i	2009-01-09 19:28:14 UTC (rev 247)
@@ -267,46 +267,50 @@
 #endif //PCSCLITE
 
 
-typedef enum
-{
-    SCARD_S_SUCCESS                  ,
-    SCARD_F_INTERNAL_ERROR           ,
-    SCARD_E_CANCELLED                ,
-    SCARD_E_INVALID_HANDLE           ,
-    SCARD_E_INVALID_PARAMETER        ,
-    SCARD_E_INVALID_TARGET           ,
-    SCARD_E_NO_MEMORY                ,
-    SCARD_F_WAITED_TOO_LONG          ,
-    SCARD_E_INSUFFICIENT_BUFFER      ,
-    SCARD_E_UNKNOWN_READER           ,
-    SCARD_E_TIMEOUT                  ,
-    SCARD_E_SHARING_VIOLATION        ,
-    SCARD_E_NO_SMARTCARD             ,
-    SCARD_E_UNKNOWN_CARD             ,
-    SCARD_E_CANT_DISPOSE             ,
-    SCARD_E_PROTO_MISMATCH           ,
-    SCARD_E_NOT_READY                ,
-    SCARD_E_INVALID_VALUE            ,
-    SCARD_E_SYSTEM_CANCELLED         ,
-    SCARD_F_COMM_ERROR               ,
-    SCARD_F_UNKNOWN_ERROR            ,
-    SCARD_E_INVALID_ATR              ,
-    SCARD_E_NOT_TRANSACTED           ,
-    SCARD_E_READER_UNAVAILABLE       ,
-    SCARD_E_PCI_TOO_SMALL            ,
-    SCARD_E_READER_UNSUPPORTED       ,
-    SCARD_E_DUPLICATE_READER         ,
-    SCARD_E_CARD_UNSUPPORTED         ,
-    SCARD_E_NO_SERVICE               ,
-    SCARD_E_SERVICE_STOPPED          ,
-    SCARD_E_UNSUPPORTED_FEATURE      ,
-    SCARD_W_UNSUPPORTED_CARD         ,
-    SCARD_W_UNRESPONSIVE_CARD        ,
-    SCARD_W_UNPOWERED_CARD           ,
-    SCARD_W_RESET_CARD               ,
-    SCARD_W_REMOVED_CARD
-} ErrorType ;
+/* int and unsigned long are different on 64-bits systems */
+#ifdef __APPLE__
+#define TYPE int
+#else
+#define TYPE unsigned long
+#endif
 
+%constant TYPE SCARD_S_SUCCESS             = SCARD_S_SUCCESS ;
+%constant TYPE SCARD_F_INTERNAL_ERROR      = SCARD_F_INTERNAL_ERROR ;
+%constant TYPE SCARD_E_CANCELLED           = SCARD_E_CANCELLED ;
+%constant TYPE SCARD_E_INVALID_HANDLE      = SCARD_E_INVALID_HANDLE ;
+%constant TYPE SCARD_E_INVALID_PARAMETER   = SCARD_E_INVALID_PARAMETER ;
+%constant TYPE SCARD_E_INVALID_TARGET      = SCARD_E_INVALID_TARGET ;
+%constant TYPE SCARD_E_NO_MEMORY           = SCARD_E_NO_MEMORY ;
+%constant TYPE SCARD_F_WAITED_TOO_LONG     = SCARD_F_WAITED_TOO_LONG ;
+%constant TYPE SCARD_E_INSUFFICIENT_BUFFER = SCARD_E_INSUFFICIENT_BUFFER ;
+%constant TYPE SCARD_E_UNKNOWN_READER      = SCARD_E_UNKNOWN_READER ;
+%constant TYPE SCARD_E_TIMEOUT             = SCARD_E_TIMEOUT ;
+%constant TYPE SCARD_E_SHARING_VIOLATION   = SCARD_E_SHARING_VIOLATION ;
+%constant TYPE SCARD_E_NO_SMARTCARD        = SCARD_E_NO_SMARTCARD ;
+%constant TYPE SCARD_E_UNKNOWN_CARD        = SCARD_E_UNKNOWN_CARD ;
+%constant TYPE SCARD_E_CANT_DISPOSE        = SCARD_E_CANT_DISPOSE ;
+%constant TYPE SCARD_E_PROTO_MISMATCH      = SCARD_E_PROTO_MISMATCH ;
+%constant TYPE SCARD_E_NOT_READY           = SCARD_E_NOT_READY ;
+%constant TYPE SCARD_E_INVALID_VALUE       = SCARD_E_INVALID_VALUE ;
+%constant TYPE SCARD_E_SYSTEM_CANCELLED    = SCARD_E_SYSTEM_CANCELLED ;
+%constant TYPE SCARD_F_COMM_ERROR          = SCARD_F_COMM_ERROR ;
+%constant TYPE SCARD_F_UNKNOWN_ERROR       = SCARD_F_UNKNOWN_ERROR ;
+%constant TYPE SCARD_E_INVALID_ATR         = SCARD_E_INVALID_ATR ;
+%constant TYPE SCARD_E_NOT_TRANSACTED      = SCARD_E_NOT_TRANSACTED ;
+%constant TYPE SCARD_E_READER_UNAVAILABLE  = SCARD_E_READER_UNAVAILABLE ;
+%constant TYPE SCARD_E_PCI_TOO_SMALL       = SCARD_E_PCI_TOO_SMALL ;
+%constant TYPE SCARD_E_READER_UNSUPPORTED  = SCARD_E_READER_UNSUPPORTED ;
+%constant TYPE SCARD_E_DUPLICATE_READER    = SCARD_E_DUPLICATE_READER ;
+%constant TYPE SCARD_E_CARD_UNSUPPORTED    = SCARD_E_CARD_UNSUPPORTED ;
+%constant TYPE SCARD_E_NO_SERVICE          = SCARD_E_NO_SERVICE ;
+%constant TYPE SCARD_E_SERVICE_STOPPED     = SCARD_E_SERVICE_STOPPED ;
+%constant TYPE SCARD_E_UNSUPPORTED_FEATURE = SCARD_E_UNSUPPORTED_FEATURE ;
+%constant TYPE SCARD_W_UNSUPPORTED_CARD    = SCARD_W_UNSUPPORTED_CARD ;
+%constant TYPE SCARD_W_UNRESPONSIVE_CARD   = SCARD_W_UNRESPONSIVE_CARD ;
+%constant TYPE SCARD_W_UNPOWERED_CARD      = SCARD_W_UNPOWERED_CARD ;
+%constant TYPE SCARD_W_RESET_CARD          = SCARD_W_RESET_CARD ;
+%constant TYPE SCARD_W_REMOVED_CARD        = SCARD_W_REMOVED_CARD  ;
+
 #ifdef WIN32
 typedef enum
 {


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