[Pcsclite-cvs-commit] r1771 - in trunk/Drivers/ccid: examples src src/openct src/towitoko

[Ludovic Rousseau]

Author: rousseau
Date: 2005-11-29 12:21:00 +0000 (Tue, 29 Nov 2005)
New Revision: 1771

Modified:
   trunk/Drivers/ccid/examples/scardcontrol.c
   trunk/Drivers/ccid/src/ccid.c
   trunk/Drivers/ccid/src/ccid_serial.c
   trunk/Drivers/ccid/src/commands.c
   trunk/Drivers/ccid/src/defs.h
   trunk/Drivers/ccid/src/ifdhandler.c
   trunk/Drivers/ccid/src/openct/proto-t1.c
   trunk/Drivers/ccid/src/towitoko/defines.h
   trunk/Drivers/ccid/src/towitoko/pps.c
   trunk/Drivers/ccid/src/utils.c
Log:
remove PCSC/ from the pcsc-lite #include header files since the PCSC/
part is already given by `pkg-config --cflags libpcsclite`


Modified: trunk/Drivers/ccid/examples/scardcontrol.c
===================================================================
--- trunk/Drivers/ccid/examples/scardcontrol.c	2005-11-29 09:24:15 UTC (rev 1770)
+++ trunk/Drivers/ccid/examples/scardcontrol.c	2005-11-29 12:21:00 UTC (rev 1771)
@@ -26,8 +26,8 @@
 #include <sys/time.h>
 #include <unistd.h>
 #include <string.h>
-#include <PCSC/winscard.h>
-#include <PCSC/reader.h>
+#include <winscard.h>
+#include <reader.h>
 
 #define VERIFY_PIN
 #undef MODIFY_PIN

Modified: trunk/Drivers/ccid/src/ccid.c
===================================================================
--- trunk/Drivers/ccid/src/ccid.c	2005-11-29 09:24:15 UTC (rev 1770)
+++ trunk/Drivers/ccid/src/ccid.c	2005-11-29 12:21:00 UTC (rev 1771)
@@ -22,8 +22,8 @@
  */
 
 #include <stdio.h>
-#include <PCSC/pcsclite.h>
-#include <PCSC/ifdhandler.h>
+#include <pcsclite.h>
+#include <ifdhandler.h>
 
 #include "config.h"
 #include "debug.h"

Modified: trunk/Drivers/ccid/src/ccid_serial.c
===================================================================
--- trunk/Drivers/ccid/src/ccid_serial.c	2005-11-29 09:24:15 UTC (rev 1770)
+++ trunk/Drivers/ccid/src/ccid_serial.c	2005-11-29 12:21:00 UTC (rev 1771)
@@ -33,7 +33,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
-#include <PCSC/ifdhandler.h>
+#include <ifdhandler.h>
 
 #include "defs.h"
 #include "ccid_ifdhandler.h"

Modified: trunk/Drivers/ccid/src/commands.c
===================================================================
--- trunk/Drivers/ccid/src/commands.c	2005-11-29 09:24:15 UTC (rev 1770)
+++ trunk/Drivers/ccid/src/commands.c	2005-11-29 12:21:00 UTC (rev 1771)
@@ -23,8 +23,8 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <PCSC/pcsclite.h>
-#include <PCSC/ifdhandler.h>
+#include <pcsclite.h>
+#include <ifdhandler.h>
 
 #include "commands.h"
 #include "openct/proto-t1.h"

Modified: trunk/Drivers/ccid/src/defs.h
===================================================================
--- trunk/Drivers/ccid/src/defs.h	2005-11-29 09:24:15 UTC (rev 1770)
+++ trunk/Drivers/ccid/src/defs.h	2005-11-29 12:21:00 UTC (rev 1771)
@@ -21,7 +21,7 @@
  * $Id$
  */
 
-#include <PCSC/pcsclite.h>
+#include <pcsclite.h>
 
 #include "openct/proto-t1.h"
 

Modified: trunk/Drivers/ccid/src/ifdhandler.c
===================================================================
--- trunk/Drivers/ccid/src/ifdhandler.c	2005-11-29 09:24:15 UTC (rev 1770)
+++ trunk/Drivers/ccid/src/ifdhandler.c	2005-11-29 12:21:00 UTC (rev 1771)
@@ -22,9 +22,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <PCSC/pcsclite.h>
-#include <PCSC/ifdhandler.h>
-#include <PCSC/reader.h>
+#include <pcsclite.h>
+#include <ifdhandler.h>
+#include <reader.h>
 
 #include "ccid.h"
 #include "defs.h"

Modified: trunk/Drivers/ccid/src/openct/proto-t1.c
===================================================================
--- trunk/Drivers/ccid/src/openct/proto-t1.c	2005-11-29 09:24:15 UTC (rev 1770)
+++ trunk/Drivers/ccid/src/openct/proto-t1.c	2005-11-29 12:21:00 UTC (rev 1771)
@@ -7,8 +7,8 @@
  * Copyright (C) 2004 Ludovic Rousseau <ludovic.rousseau at free.fr>
  */
 
-#include <PCSC/pcsclite.h>
-#include <PCSC/ifdhandler.h>
+#include <pcsclite.h>
+#include <ifdhandler.h>
 #include "commands.h"
 #include "buffer.h"
 #include "debug.h"

Modified: trunk/Drivers/ccid/src/towitoko/defines.h
===================================================================
--- trunk/Drivers/ccid/src/towitoko/defines.h	2005-11-29 09:24:15 UTC (rev 1770)
+++ trunk/Drivers/ccid/src/towitoko/defines.h	2005-11-29 12:21:00 UTC (rev 1771)
@@ -46,7 +46,7 @@
  * Type definitions
  */
 
-#include <PCSC/wintypes.h>
+#include <wintypes.h>
 
 #ifndef __cplusplus
 typedef int                bool;

Modified: trunk/Drivers/ccid/src/towitoko/pps.c
===================================================================
--- trunk/Drivers/ccid/src/towitoko/pps.c	2005-11-29 09:24:15 UTC (rev 1770)
+++ trunk/Drivers/ccid/src/towitoko/pps.c	2005-11-29 12:21:00 UTC (rev 1771)
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <PCSC/ifdhandler.h>
+#include <ifdhandler.h>
 
 #include "commands.h"
 #include "defs.h"

Modified: trunk/Drivers/ccid/src/utils.c
===================================================================
--- trunk/Drivers/ccid/src/utils.c	2005-11-29 09:24:15 UTC (rev 1770)
+++ trunk/Drivers/ccid/src/utils.c	2005-11-29 12:21:00 UTC (rev 1771)
@@ -21,7 +21,7 @@
  * $Id$
  */
 
-#include <PCSC/pcsclite.h>
+#include <pcsclite.h>
 
 #include "ccid.h"
 #include "defs.h"