[Pcsclite-cvs-commit] PCSC/src winscard_svc.c,1.29,1.30 winscard_scf.c,1.14,1.15 winscard_msg.c,1.23,1.24 winscard_clnt.c,1.40,1.41 winscard.c,1.42,1.43 tokenfactory.h,1.4,1.5 tokenfactory.c,1.23,1.24 thread_unix.c,1.16,1.17 testpcsc.c,1.19,1.20 sys_unix.c,1.11,1.12 readerfactory.c,1.60,1.61 prothandler.c,1.14,1.15 powermgt_macosx.c,1.15,1.16 powermgt_generic.c,1.5,1.6 pcscdaemon.c,1.54,1.55 muscletest.c,1.13,1.14 musclecard.c,1.39,1.40 ifdwrapper.c,1.24,1.25 hotplug_macosx.c,1.21,1.22 hotplug_linux.c,1.30,1.31 hotplug_libusb.c,1.31,1.32 hotplug_generic.c,1.8,1.9 eventhandler.c,1.26,1.27 dyn_unix.c,1.11,1.12 dyn_macosx.c,1.8,1.9 dyn_hpux.c,1.9,1.10 debuglog.c,1.24,1.25 atrhandler.c,1.13,1.14

rousseau@haydn.debian.org rousseau@haydn.debian.org


Update of /cvsroot/pcsclite/PCSC/src
In directory haydn:/tmp/cvs-serv7583/src

Modified Files:
	winscard_svc.c winscard_scf.c winscard_msg.c winscard_clnt.c 
	winscard.c tokenfactory.h tokenfactory.c thread_unix.c 
	testpcsc.c sys_unix.c readerfactory.c prothandler.c 
	powermgt_macosx.c powermgt_generic.c pcscdaemon.c muscletest.c 
	musclecard.c ifdwrapper.c hotplug_macosx.c hotplug_linux.c 
	hotplug_libusb.c hotplug_generic.c eventhandler.c dyn_unix.c 
	dyn_macosx.c dyn_hpux.c debuglog.c atrhandler.c 
Log Message:
remove PCSC/ from the header files path since the path is given by
pkg-config --cflags libpcsclite or the correct -I directive


Index: winscard_svc.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_svc.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- winscard_svc.c	3 Aug 2004 19:52:02 -0000	1.29
+++ winscard_svc.c	6 Aug 2004 12:12:19 -0000	1.30
@@ -17,9 +17,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "PCSC/pcsclite.h"
-#include "PCSC/winscard.h"
-#include "PCSC/debuglog.h"
+#include "pcsclite.h"
+#include "winscard.h"
+#include "debuglog.h"
 #include "winscard_msg.h"
 #include "winscard_svc.h"
 #include "sys_generic.h"

Index: winscard_scf.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_scf.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- winscard_scf.c	17 Jun 2004 07:44:03 -0000	1.14
+++ winscard_scf.c	6 Aug 2004 12:12:19 -0000	1.15
@@ -19,9 +19,9 @@
 #include <sys/un.h>
 #include <smartcard/scf.h>
 
-#include "PCSC/pcsclite.h"
-#include "PCSC/winscard.h"
-#include "PCSC/debuglog.h"
+#include "pcsclite.h"
+#include "winscard.h"
+#include "debuglog.h"
 
 #ifdef USE_THREAD_SAFETY
 #include "thread_generic.h"

Index: winscard_msg.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_msg.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- winscard_msg.c	10 Jun 2004 14:57:47 -0000	1.23
+++ winscard_msg.c	6 Aug 2004 12:12:19 -0000	1.24
@@ -28,9 +28,9 @@
 #include <sys/filio.h>
 #endif
 
-#include "PCSC/pcsclite.h"
-#include "PCSC/winscard.h"
-#include "PCSC/debuglog.h"
+#include "pcsclite.h"
+#include "winscard.h"
+#include "debuglog.h"
 #include "winscard_msg.h"
 #include "sys_generic.h"
 

Index: winscard_clnt.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_clnt.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- winscard_clnt.c	22 Jun 2004 14:38:14 -0000	1.40
+++ winscard_clnt.c	6 Aug 2004 12:12:19 -0000	1.41
@@ -21,9 +21,9 @@
 #include <sys/un.h>
 #include <errno.h>
 
-#include "PCSC/pcsclite.h"
-#include "PCSC/winscard.h"
-#include "PCSC/debuglog.h"
+#include "pcsclite.h"
+#include "winscard.h"
+#include "debuglog.h"
 #include "thread_generic.h"
 
 #include "readerfactory.h"

Index: winscard.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- winscard.c	2 Aug 2004 20:21:10 -0000	1.42
+++ winscard.c	6 Aug 2004 12:12:19 -0000	1.43
@@ -16,10 +16,10 @@
 #include <sys/time.h>
 #include <string.h>
 
-#include "PCSC/pcsclite.h"
-#include "PCSC/winscard.h"
-#include "PCSC/ifdhandler.h"
-#include "PCSC/debuglog.h"
+#include "pcsclite.h"
+#include "winscard.h"
+#include "ifdhandler.h"
+#include "debuglog.h"
 #include "readerfactory.h"
 #include "prothandler.h"
 #include "ifdwrapper.h"

Index: tokenfactory.h
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/tokenfactory.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tokenfactory.h	10 Jun 2004 14:57:47 -0000	1.4
+++ tokenfactory.h	6 Aug 2004 12:12:20 -0000	1.5
@@ -12,7 +12,7 @@
 #ifndef __tokenfactory_h__
 #define __tokenfactory_h__
 
-#include "PCSC/mscdefines.h"
+#include "mscdefines.h"
 
 #ifdef __cplusplus
 extern "C"

Index: tokenfactory.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/tokenfactory.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- tokenfactory.c	29 Jul 2004 20:44:26 -0000	1.23
+++ tokenfactory.c	6 Aug 2004 12:12:20 -0000	1.24
@@ -20,8 +20,8 @@
 #include <dirent.h>
 #endif
 
-#include "PCSC/debuglog.h"
-#include "PCSC/parser.h"
+#include "debuglog.h"
+#include "parser.h"
 #include "dyn_generic.h"
 #include "tokenfactory.h"
 

Index: thread_unix.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/thread_unix.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- thread_unix.c	2 Aug 2004 21:51:38 -0000	1.16
+++ thread_unix.c	6 Aug 2004 12:12:20 -0000	1.17
@@ -12,7 +12,7 @@
  */
 
 #include "config.h"
-#include "PCSC/wintypes.h"
+#include "wintypes.h"
 #include "thread_generic.h"
 
 #ifndef TRUE

Index: testpcsc.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/testpcsc.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- testpcsc.c	2 Aug 2004 20:57:52 -0000	1.19
+++ testpcsc.c	6 Aug 2004 12:12:20 -0000	1.20
@@ -13,8 +13,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "PCSC/pcsclite.h"
-#include "PCSC/winscard.h"
+#include "pcsclite.h"
+#include "winscard.h"
 
 int main(int argc, char **argv)
 {

Index: sys_unix.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/sys_unix.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- sys_unix.c	17 Jun 2004 06:44:01 -0000	1.11
+++ sys_unix.c	6 Aug 2004 12:12:20 -0000	1.12
@@ -26,7 +26,7 @@
 #include <time.h>
 
 #include "sys_generic.h"
-#include "PCSC/debuglog.h"
+#include "debuglog.h"
 
 int SYS_Initialize(void)
 {

Index: readerfactory.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/readerfactory.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- readerfactory.c	1 Aug 2004 15:39:49 -0000	1.60
+++ readerfactory.c	6 Aug 2004 12:12:20 -0000	1.61
@@ -21,9 +21,9 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include "PCSC/pcsclite.h"
-#include "PCSC/ifdhandler.h"
-#include "PCSC/debuglog.h"
+#include "pcsclite.h"
+#include "ifdhandler.h"
+#include "debuglog.h"
 #include "thread_generic.h"
 #include "readerfactory.h"
 #include "dyn_generic.h"

Index: prothandler.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/prothandler.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- prothandler.c	29 Jun 2004 07:48:34 -0000	1.14
+++ prothandler.c	6 Aug 2004 12:12:20 -0000	1.15
@@ -14,9 +14,9 @@
 #include "config.h"
 #include <string.h>
 
-#include "PCSC/pcsclite.h"
-#include "PCSC/ifdhandler.h"
-#include "PCSC/debuglog.h"
+#include "pcsclite.h"
+#include "ifdhandler.h"
+#include "debuglog.h"
 #include "readerfactory.h"
 #include "prothandler.h"
 #include "atrhandler.h"

Index: powermgt_macosx.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/powermgt_macosx.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- powermgt_macosx.c	10 Jun 2004 14:57:47 -0000	1.15
+++ powermgt_macosx.c	6 Aug 2004 12:12:20 -0000	1.16
@@ -34,8 +34,8 @@
 #include <IOKit/pwr_mgt/IOPMLib.h>
 #include <IOKit/IOMessage.h>
 
-#include "PCSC/pcsclite.h"
-#include "PCSC/debuglog.h"
+#include "pcsclite.h"
+#include "debuglog.h"
 #include "readerfactory.h"
 #include "thread_generic.h"
 #include "hotplug.h"

Index: powermgt_generic.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/powermgt_generic.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- powermgt_generic.c	17 Jun 2004 06:44:01 -0000	1.5
+++ powermgt_generic.c	6 Aug 2004 12:12:20 -0000	1.6
@@ -10,7 +10,7 @@
  */
 
 #include "config.h"
-#include "PCSC/pcsclite.h"
+#include "pcsclite.h"
 
 /*
  * Check for platforms that have their own specific support.

Index: pcscdaemon.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/pcscdaemon.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- pcscdaemon.c	17 Jun 2004 08:41:04 -0000	1.54
+++ pcscdaemon.c	6 Aug 2004 12:12:20 -0000	1.55
@@ -25,8 +25,8 @@
 #include <getopt.h>
 #endif
 
-#include "PCSC/pcsclite.h"
-#include "PCSC/debuglog.h"
+#include "pcsclite.h"
+#include "debuglog.h"
 #include "winscard_msg.h"
 #include "winscard_svc.h"
 #include "sys_generic.h"

Index: muscletest.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/muscletest.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- muscletest.c	10 Jun 2004 14:57:47 -0000	1.13
+++ muscletest.c	6 Aug 2004 12:12:20 -0000	1.14
@@ -13,10 +13,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "PCSC/pcsclite.h"
-#include "PCSC/winscard.h"
-#include "PCSC/mscdefines.h"
-#include "PCSC/musclecard.h"
+#include "pcsclite.h"
+#include "winscard.h"
+#include "mscdefines.h"
+#include "musclecard.h"
 
 #define MY_OBJECT_ID    "c1"
 #define MY_OBJECT_SIZE  50

Index: musclecard.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/musclecard.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- musclecard.c	2 Aug 2004 22:01:14 -0000	1.39
+++ musclecard.c	6 Aug 2004 12:12:20 -0000	1.40
@@ -18,12 +18,12 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "PCSC/musclecard.h"
-#include "PCSC/debuglog.h"
+#include "musclecard.h"
+#include "debuglog.h"
 #include "tokenfactory.h"
 
 #ifdef USE_THREAD_SAFETY
-#include "PCSC/wintypes.h"
+#include "wintypes.h"
 #include "thread_generic.h"
 #include "sys_generic.h"
 #endif

Index: ifdwrapper.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/ifdwrapper.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ifdwrapper.c	22 Jul 2004 13:29:16 -0000	1.24
+++ ifdwrapper.c	6 Aug 2004 12:12:20 -0000	1.25
@@ -12,9 +12,9 @@
  */
 
 #include "config.h"
-#include "PCSC/pcsclite.h"
-#include "PCSC/ifdhandler.h"
-#include "PCSC/debuglog.h"
+#include "pcsclite.h"
+#include "ifdhandler.h"
+#include "debuglog.h"
 #include "readerfactory.h"
 #include "ifdwrapper.h"
 #include "atrhandler.h"

Index: hotplug_macosx.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/hotplug_macosx.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- hotplug_macosx.c	10 Jun 2004 14:57:47 -0000	1.21
+++ hotplug_macosx.c	6 Aug 2004 12:12:20 -0000	1.22
@@ -12,7 +12,7 @@
  */
 
 #include "config.h"
-#include "PCSC/pcsclite.h"
+#include "pcsclite.h"
 
 #ifdef __APPLE__
 #include <CoreFoundation/CoreFoundation.h>
@@ -22,8 +22,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "PCSC/debuglog.h"
-#include "PCSC/parser.h"
+#include "debuglog.h"
+#include "parser.h"
 #include "readerfactory.h"
 #include "winscard_msg.h"
 #include "sys_generic.h"

Index: hotplug_linux.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/hotplug_linux.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- hotplug_linux.c	2 Aug 2004 22:06:43 -0000	1.30
+++ hotplug_linux.c	6 Aug 2004 12:12:20 -0000	1.31
@@ -25,9 +25,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "PCSC/pcsclite.h"
-#include "PCSC/debuglog.h"
-#include "PCSC/parser.h"
+#include "pcsclite.h"
+#include "debuglog.h"
+#include "parser.h"
 #include "readerfactory.h"
 #include "winscard_msg.h"
 #include "sys_generic.h"

Index: hotplug_libusb.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/hotplug_libusb.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- hotplug_libusb.c	2 Aug 2004 22:06:44 -0000	1.31
+++ hotplug_libusb.c	6 Aug 2004 12:12:20 -0000	1.32
@@ -26,9 +26,9 @@
 #include <errno.h>
 #include <usb.h>
 
-#include "PCSC/pcsclite.h"
-#include "PCSC/debuglog.h"
-#include "PCSC/parser.h"
+#include "pcsclite.h"
+#include "debuglog.h"
+#include "parser.h"
 #include "readerfactory.h"
 #include "winscard_msg.h"
 #include "sys_generic.h"

Index: hotplug_generic.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/hotplug_generic.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- hotplug_generic.c	10 Jun 2004 14:57:47 -0000	1.8
+++ hotplug_generic.c	6 Aug 2004 12:12:20 -0000	1.9
@@ -10,7 +10,7 @@
  */
 
 #include "config.h"
-#include "PCSC/pcsclite.h"
+#include "pcsclite.h"
 
 /*
  * Check for platforms that have their own specific support.

Index: eventhandler.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/eventhandler.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- eventhandler.c	2 Aug 2004 22:06:44 -0000	1.26
+++ eventhandler.c	6 Aug 2004 12:12:20 -0000	1.27
@@ -20,9 +20,9 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "PCSC/pcsclite.h"
-#include "PCSC/ifdhandler.h"
-#include "PCSC/debuglog.h"
+#include "pcsclite.h"
+#include "ifdhandler.h"
+#include "debuglog.h"
 #include "thread_generic.h"
 #include "readerfactory.h"
 #include "eventhandler.h"

Index: dyn_unix.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/dyn_unix.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- dyn_unix.c	21 Jun 2004 07:40:26 -0000	1.11
+++ dyn_unix.c	6 Aug 2004 12:12:20 -0000	1.12
@@ -18,8 +18,8 @@
 #include <dlfcn.h>
 #include <stdlib.h>
 
-#include "PCSC/pcsclite.h"
-#include "PCSC/debuglog.h"
+#include "pcsclite.h"
+#include "debuglog.h"
 #include "dyn_generic.h"
 
 int DYN_LoadLibrary(void **pvLHandle, char *pcLibrary)

Index: dyn_macosx.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/dyn_macosx.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- dyn_macosx.c	10 Jun 2004 14:57:47 -0000	1.8
+++ dyn_macosx.c	6 Aug 2004 12:12:20 -0000	1.9
@@ -11,8 +11,8 @@
 
 #include "config.h"
 
-#include "PCSC/pcsclite.h"
-#include "PCSC/debuglog.h"
+#include "pcsclite.h"
+#include "debuglog.h"
 #include "dyn_generic.h"
 
 #ifdef __APPLE__

Index: dyn_hpux.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/dyn_hpux.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- dyn_hpux.c	21 Jun 2004 07:40:26 -0000	1.9
+++ dyn_hpux.c	6 Aug 2004 12:12:20 -0000	1.10
@@ -17,8 +17,8 @@
 #include <dl.h>
 #include <errno.h>
 
-#include "PCSC/pcsclite.h"
-#include "PCSC/debuglog.h"
+#include "pcsclite.h"
+#include "debuglog.h"
 #include "dyn_generic.h"
 
 int DYN_LoadLibrary(void **pvLHandle, char *pcLibrary)

Index: debuglog.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/debuglog.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- debuglog.c	10 Jun 2004 14:57:47 -0000	1.24
+++ debuglog.c	6 Aug 2004 12:12:20 -0000	1.25
@@ -22,8 +22,8 @@
 #include <assert.h>
 #include <sys/types.h>
 
-#include "PCSC/pcsclite.h"
-#include "PCSC/debuglog.h"
+#include "pcsclite.h"
+#include "debuglog.h"
 #include "sys_generic.h"
 
 /* Max string size when dumping a 256 bytes longs APDU

Index: atrhandler.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/atrhandler.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- atrhandler.c	25 Jun 2004 13:57:40 -0000	1.13
+++ atrhandler.c	6 Aug 2004 12:12:20 -0000	1.14
@@ -15,8 +15,8 @@
 #include <syslog.h>
 #include <string.h>
 
-#include "PCSC/pcsclite.h"
-#include "PCSC/debuglog.h"
+#include "pcsclite.h"
+#include "debuglog.h"
 #include "atrhandler.h"
 
 /*