[Pcsclite-cvs-commit] Drivers/ccid/src/protocol_t1 protocol_t1.c,1.9,1.10 defines.h,1.1,1.2 atr.c,1.1,1.2

[rousseau@haydn.debian.org]

Update of /cvsroot/pcsclite/Drivers/ccid/src/protocol_t1
In directory haydn:/tmp/cvs-serv30118/src/protocol_t1

Modified Files:
	protocol_t1.c defines.h atr.c 
Log Message:
reorganize header files


Index: protocol_t1.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/protocol_t1/protocol_t1.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- protocol_t1.c	7 May 2004 12:20:18 -0000	1.9
+++ protocol_t1.c	17 May 2004 14:35:51 -0000	1.10
@@ -24,6 +24,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <pcsclite.h>
+#include <ifdhandler.h>
+
 #include "protocol_t1.h"
 #include "t1_block.h"
 #include "atr.h"
@@ -32,7 +35,7 @@
 #include "defs.h"
 #include "ccid.h"
 #include "commands.h"
-#include "ifdhandler.h"
+#include "ccid_ifdhandler.h"
 #include "debug.h"
 
 /*

Index: defines.h
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/protocol_t1/defines.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- defines.h	15 Jan 2004 14:34:21 -0000	1.1
+++ defines.h	17 May 2004 14:35:51 -0000	1.2
@@ -46,9 +46,8 @@
  * Type definitions
  */
 
-#include "pcscdefines.h"
+#include <pcsclite.h>
 
-typedef unsigned char      BYTE;
 #ifndef __cplusplus
 typedef int                bool;
 #endif

Index: atr.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/protocol_t1/atr.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- atr.c	15 Jan 2004 14:34:21 -0000	1.1
+++ atr.c	17 May 2004 14:35:51 -0000	1.2
@@ -20,7 +20,6 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "pcscdefines.h"
 #include "atr.h"
 #include <stdlib.h>
 #include <string.h>