[Pcsclite-cvs-commit] r6259 - in /trunk/Drivers/ccid/src: defs.h ifdhandler.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Thu Apr  5 09:44:16 2012
New Revision: 6259

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=6259
Log:
Move definitions of DWORD_X and DWORD_D

Modified:
    trunk/Drivers/ccid/src/defs.h
    trunk/Drivers/ccid/src/ifdhandler.c

Modified: trunk/Drivers/ccid/src/defs.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/defs.h?rev=6259&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/defs.h (original)
+++ trunk/Drivers/ccid/src/defs.h Thu Apr  5 09:44:16 2012
@@ -77,6 +77,17 @@
 /* Default communication read timeout in milliseconds */
 #define DEFAULT_COM_READ_TIMEOUT (2*1000)
 
+/* DWORD type formating */
+#ifdef __APPLE__
+/* Apple defines DWORD as uint32_t */
+#define DWORD_X "%X"
+#define DWORD_D "%d"
+#else
+/* pcsc-lite defines DWORD as unsigned long */
+#define DWORD_X "%lX"
+#define DWORD_D "%ld"
+#endif
+
 /*
  * communication ports abstraction
  */

Modified: trunk/Drivers/ccid/src/ifdhandler.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/ifdhandler.c?rev=6259&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ifdhandler.c (original)
+++ trunk/Drivers/ccid/src/ifdhandler.c Thu Apr  5 09:44:16 2012
@@ -42,16 +42,6 @@
 
 #ifdef HAVE_PTHREAD
 #include <pthread.h>
-#endif
-
-#ifdef __APPLE__
-/* Apple defines DWORD as uint32_t */
-#define DWORD_X "%X"
-#define DWORD_D "%d"
-#else
-/* pcsc-lite defines DWORD as unsigned long */
-#define DWORD_X "%lX"
-#define DWORD_D "%ld"
 #endif
 
 /* Array of structures to hold the ATR and other state value of each slot */