[Pcsclite-cvs-commit] PCSC/src atrhandler.c,1.9,1.10 configfile.l,1.14,1.15 debuglog.c,1.23,1.24 dyn_hpux.c,1.7,1.8 dyn_macosx.c,1.7,1.8 dyn_unix.c,1.9,1.10 eventhandler.c,1.18,1.19 hotplug_generic.c,1.7,1.8 hotplug_libusb.c,1.27,1.28 hotplug_linux.c,1.26,1.27 hotplug_macosx.c,1.20,1.21 ifdwrapper.c,1.17,1.18 musclecard.c,1.36,1.37 muscletest.c,1.12,1.13 pcscdaemon.c,1.51,1.52 powermgt_generic.c,1.3,1.4 powermgt_macosx.c,1.14,1.15 prothandler.c,1.8,1.9 readerfactory.c,1.47,1.48 sys_unix.c,1.9,1.10 testpcsc.c,1.14,1.15 thread_unix.c,1.13,1.14 tokenfactory.c,1.20,1.21 tokenfactory.h,1.3,1.4 tokenparser.l,1.11,1.12 winscard.c,1.27,1.28 winscard_clnt.c,1.36,1.37 winscard_msg.c,1.22,1.23 winscard_scf.c,1.11,1.12 winscard_svc.c,1.25,1.26

[rousseau@haydn.debian.org]

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

Modified Files:
	atrhandler.c configfile.l debuglog.c dyn_hpux.c dyn_macosx.c 
	dyn_unix.c eventhandler.c hotplug_generic.c hotplug_libusb.c 
	hotplug_linux.c hotplug_macosx.c ifdwrapper.c musclecard.c 
	muscletest.c pcscdaemon.c powermgt_generic.c powermgt_macosx.c 
	prothandler.c readerfactory.c sys_unix.c testpcsc.c 
	thread_unix.c tokenfactory.c tokenfactory.h tokenparser.l 
	winscard.c winscard_clnt.c winscard_msg.c winscard_scf.c 
	winscard_svc.c 
Log Message:
use the new PCSC/ location for header files


Index: atrhandler.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/atrhandler.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- atrhandler.c	9 Jun 2004 06:58:44 -0000	1.9
+++ atrhandler.c	10 Jun 2004 14:57:47 -0000	1.10
@@ -15,10 +15,9 @@
 #include <syslog.h>
 #include <string.h>
 
-#include "wintypes.h"
-#include "pcsclite.h"
+#include "PCSC/pcsclite.h"
+#include "PCSC/debuglog.h"
 #include "atrhandler.h"
-#include "debuglog.h"
 
 /*
  * Uncomment the following for ATR debugging 

Index: configfile.l
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/configfile.l,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- configfile.l	24 May 2004 06:36:19 -0000	1.14
+++ configfile.l	10 Jun 2004 14:57:47 -0000	1.15
@@ -39,14 +39,13 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <wintypes.h>
 #include <errno.h>
 
+#include "PCSC/pcsclite.h"
+#include "PCSC/debuglog.h"
 #include "config.h"
-#include "pcsclite.h"
 #include "sys_generic.h"
 #include "readerfactory.h"
-#include "debuglog.h"
 
 int evaluatetoken(char *pcToken)
 {

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

Index: dyn_hpux.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/dyn_hpux.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- dyn_hpux.c	21 Apr 2004 21:42:33 -0000	1.7
+++ dyn_hpux.c	10 Jun 2004 14:57:47 -0000	1.8
@@ -17,10 +17,9 @@
 #include <dl.h>
 #include <errno.h>
 
-#include "wintypes.h"
-#include "pcsclite.h"
+#include "PCSC/pcsclite.h"
+#include "PCSC/debuglog.h"
 #include "dyn_generic.h"
-#include "debuglog.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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- dyn_macosx.c	25 May 2004 12:44:30 -0000	1.7
+++ dyn_macosx.c	10 Jun 2004 14:57:47 -0000	1.8
@@ -11,10 +11,9 @@
 
 #include "config.h"
 
-#include "wintypes.h"
-#include "pcsclite.h"
+#include "PCSC/pcsclite.h"
+#include "PCSC/debuglog.h"
 #include "dyn_generic.h"
-#include "debuglog.h"
 
 #ifdef __APPLE__
 #include <CoreFoundation/CFBundle.h>

Index: dyn_unix.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/dyn_unix.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- dyn_unix.c	21 Apr 2004 21:42:33 -0000	1.9
+++ dyn_unix.c	10 Jun 2004 14:57:47 -0000	1.10
@@ -18,10 +18,9 @@
 #include <dlfcn.h>
 #include <stdlib.h>
 
-#include "wintypes.h"
-#include "pcsclite.h"
+#include "PCSC/pcsclite.h"
+#include "PCSC/debuglog.h"
 #include "dyn_generic.h"
-#include "debuglog.h"
 
 int DYN_LoadLibrary(void **pvLHandle, char *pcLibrary)
 {

Index: eventhandler.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/eventhandler.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- eventhandler.c	5 Jun 2004 15:43:11 -0000	1.18
+++ eventhandler.c	10 Jun 2004 14:57:47 -0000	1.19
@@ -20,16 +20,15 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "wintypes.h"
-#include "pcsclite.h"
+#include "PCSC/pcsclite.h"
+#include "PCSC/ifdhandler.h"
+#include "PCSC/debuglog.h"
 #include "thread_generic.h"
 #include "readerfactory.h"
 #include "eventhandler.h"
 #include "dyn_generic.h"
 #include "sys_generic.h"
-#include "ifdhandler.h"
 #include "ifdwrapper.h"
-#include "debuglog.h"
 #include "prothandler.h"
 
 static PREADER_STATES readerStates[PCSCLITE_MAX_READERS_CONTEXTS];

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

Index: hotplug_libusb.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/hotplug_libusb.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- hotplug_libusb.c	9 Jun 2004 09:57:02 -0000	1.27
+++ hotplug_libusb.c	10 Jun 2004 14:57:47 -0000	1.28
@@ -26,13 +26,12 @@
 #include <errno.h>
 #include <usb.h>
 
-#include "wintypes.h"
-#include "pcsclite.h"
+#include "PCSC/pcsclite.h"
+#include "PCSC/debuglog.h"
+#include "PCSC/parser.h"
 #include "readerfactory.h"
 #include "winscard_msg.h"
-#include "debuglog.h"
 #include "sys_generic.h"
-#include "parser.h"
 #include "hotplug.h"
 
 #undef DEBUG_HOTPLUG

Index: hotplug_linux.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/hotplug_linux.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- hotplug_linux.c	25 May 2004 12:44:30 -0000	1.26
+++ hotplug_linux.c	10 Jun 2004 14:57:47 -0000	1.27
@@ -25,13 +25,12 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "wintypes.h"
-#include "pcsclite.h"
+#include "PCSC/pcsclite.h"
+#include "PCSC/debuglog.h"
+#include "PCSC/parser.h"
 #include "readerfactory.h"
 #include "winscard_msg.h"
-#include "debuglog.h"
 #include "sys_generic.h"
-#include "parser.h"
 #include "hotplug.h"
 
 #define PCSCLITE_USB_PATH		"/proc/bus/usb"

Index: hotplug_macosx.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/hotplug_macosx.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- hotplug_macosx.c	25 May 2004 12:44:30 -0000	1.20
+++ hotplug_macosx.c	10 Jun 2004 14:57:47 -0000	1.21
@@ -12,7 +12,7 @@
  */
 
 #include "config.h"
-#include "wintypes.h"
+#include "PCSC/pcsclite.h"
 
 #ifdef __APPLE__
 #include <CoreFoundation/CoreFoundation.h>
@@ -22,12 +22,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "pcsclite.h"
+#include "PCSC/debuglog.h"
+#include "PCSC/parser.h"
 #include "readerfactory.h"
 #include "winscard_msg.h"
-#include "debuglog.h"
 #include "sys_generic.h"
-#include "parser.h"
 #include "hotplug.h"
 
 #undef DEBUG_HOTPLUG

Index: ifdwrapper.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/ifdwrapper.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ifdwrapper.c	5 Jun 2004 15:43:11 -0000	1.17
+++ ifdwrapper.c	10 Jun 2004 14:57:47 -0000	1.18
@@ -12,15 +12,14 @@
  */
 
 #include "config.h"
-#include "wintypes.h"
-#include "pcsclite.h"
+#include "PCSC/pcsclite.h"
+#include "PCSC/ifdhandler.h"
+#include "PCSC/debuglog.h"
 #include "readerfactory.h"
-#include "ifdhandler.h"
 #include "ifdwrapper.h"
 #include "atrhandler.h"
 #include "dyn_generic.h"
 #include "sys_generic.h"
-#include "debuglog.h"
 
 #undef PCSCLITE_STATIC_DRIVER
 

Index: musclecard.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/musclecard.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- musclecard.c	31 Mar 2004 13:48:31 -0000	1.36
+++ musclecard.c	10 Jun 2004 14:57:47 -0000	1.37
@@ -18,12 +18,12 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "musclecard.h"
+#include "PCSC/musclecard.h"
+#include "PCSC/debuglog.h"
 #include "tokenfactory.h"
-#include "debuglog.h"
 
 #ifdef USE_THREAD_SAFETY
-#include "wintypes.h"
+#include "PCSC/wintypes.h"
 #include "thread_generic.h"
 #include "sys_generic.h"
 #endif

Index: muscletest.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/muscletest.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- muscletest.c	25 May 2004 12:44:30 -0000	1.12
+++ muscletest.c	10 Jun 2004 14:57:47 -0000	1.13
@@ -13,12 +13,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-/* use the local pcsclite.h instead of the (old) one already installed */
-#include "pcsclite.h"
-
-#include <winscard.h>
-#include <mscdefines.h>
-#include <musclecard.h>
+#include "PCSC/pcsclite.h"
+#include "PCSC/winscard.h"
+#include "PCSC/mscdefines.h"
+#include "PCSC/musclecard.h"
 
 #define MY_OBJECT_ID    "c1"
 #define MY_OBJECT_SIZE  50

Index: pcscdaemon.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/pcscdaemon.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- pcscdaemon.c	11 May 2004 08:08:33 -0000	1.51
+++ pcscdaemon.c	10 Jun 2004 14:57:47 -0000	1.52
@@ -25,14 +25,13 @@
 #include <getopt.h>
 #endif
 
-#include "wintypes.h"
-#include "pcsclite.h"
+#include "PCSC/pcsclite.h"
+#include "PCSC/debuglog.h"
 #include "winscard_msg.h"
 #include "winscard_svc.h"
 #include "sys_generic.h"
 #include "thread_generic.h"
 #include "hotplug.h"
-#include "debuglog.h"
 #include "readerfactory.h"
 #include "configfile.h"
 #include "powermgt_generic.h"

Index: powermgt_generic.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/powermgt_generic.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- powermgt_generic.c	18 Oct 2003 17:19:36 -0000	1.3
+++ powermgt_generic.c	10 Jun 2004 14:57:47 -0000	1.4
@@ -10,8 +10,7 @@
  */
 
 #include "config.h"
-#include "wintypes.h"
-#include "pcsclite.h"
+#include "PCSC/pcsclite.h"
 
 /*
  * Check for platforms that have their own specific support.

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

Index: prothandler.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/prothandler.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- prothandler.c	9 Jun 2004 07:27:15 -0000	1.8
+++ prothandler.c	10 Jun 2004 14:57:47 -0000	1.9
@@ -14,14 +14,13 @@
 #include "config.h"
 #include <string.h>
 
-#include "wintypes.h"
-#include "pcsclite.h"
+#include "PCSC/pcsclite.h"
+#include "PCSC/ifdhandler.h"
+#include "PCSC/debuglog.h"
 #include "readerfactory.h"
 #include "prothandler.h"
 #include "atrhandler.h"
-#include "ifdhandler.h"
 #include "ifdwrapper.h"
-#include "debuglog.h"
 
 /*
  * Function: PHGetDefaultProtocol Purpose : To get the default protocol

Index: readerfactory.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/readerfactory.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- readerfactory.c	10 Jun 2004 13:18:42 -0000	1.47
+++ readerfactory.c	10 Jun 2004 14:57:47 -0000	1.48
@@ -21,16 +21,15 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include "wintypes.h"
-#include "pcsclite.h"
+#include "PCSC/pcsclite.h"
+#include "PCSC/ifdhandler.h"
+#include "PCSC/debuglog.h"
 #include "thread_generic.h"
 #include "readerfactory.h"
 #include "dyn_generic.h"
 #include "sys_generic.h"
 #include "eventhandler.h"
-#include "ifdhandler.h"
 #include "ifdwrapper.h"
-#include "debuglog.h"
 #include "hotplug.h"
 
 #ifndef TRUE

Index: sys_unix.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/sys_unix.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sys_unix.c	21 Apr 2004 21:42:33 -0000	1.9
+++ sys_unix.c	10 Jun 2004 14:57:47 -0000	1.10
@@ -26,7 +26,7 @@
 #include <time.h>
 
 #include "sys_generic.h"
-#include "debuglog.h"
+#include "PCSC/debuglog.h"
 
 int SYS_Initialize()
 {

Index: testpcsc.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/testpcsc.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- testpcsc.c	25 May 2004 12:44:30 -0000	1.14
+++ testpcsc.c	10 Jun 2004 14:57:47 -0000	1.15
@@ -13,8 +13,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "pcsclite.h"
-#include "winscard.h"
+#include "PCSC/pcsclite.h"
+#include "PCSC/winscard.h"
 
 int main(int argc, char **argv)
 {

Index: thread_unix.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/thread_unix.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- thread_unix.c	7 Jun 2004 13:52:58 -0000	1.13
+++ thread_unix.c	10 Jun 2004 14:57:47 -0000	1.14
@@ -12,7 +12,7 @@
  */
 
 #include "config.h"
-#include "wintypes.h"
+#include "PCSC/wintypes.h"
 #include "thread_generic.h"
 
 #ifndef TRUE

Index: tokenfactory.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/tokenfactory.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- tokenfactory.c	21 Apr 2004 21:42:33 -0000	1.20
+++ tokenfactory.c	10 Jun 2004 14:57:47 -0000	1.21
@@ -20,10 +20,10 @@
 #include <dirent.h>
 #endif
 
-#include "debuglog.h"
+#include "PCSC/debuglog.h"
+#include "PCSC/parser.h"
 #include "dyn_generic.h"
 #include "tokenfactory.h"
-#include "parser.h"
 
 #ifndef WIN32
 #ifndef MSC_SVC_DROPDIR

Index: tokenfactory.h
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/tokenfactory.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tokenfactory.h	18 Oct 2003 17:19:36 -0000	1.3
+++ tokenfactory.h	10 Jun 2004 14:57:47 -0000	1.4
@@ -12,7 +12,7 @@
 #ifndef __tokenfactory_h__
 #define __tokenfactory_h__
 
-#include "mscdefines.h"
+#include "PCSC/mscdefines.h"
 
 #ifdef __cplusplus
 extern "C"

Index: tokenparser.l
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/tokenparser.l,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- tokenparser.l	5 Jun 2004 15:58:47 -0000	1.11
+++ tokenparser.l	10 Jun 2004 14:57:47 -0000	1.12
@@ -17,8 +17,8 @@
 #include <string.h>
 #include <errno.h>
 
-#include "debuglog.h"
-#include "parser.h"
+#include "PCSC/debuglog.h"
+#include "PCSC/parser.h"
 
 void tpevalToken(char *pcToken, int tokType);
 

Index: winscard.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- winscard.c	9 Jun 2004 07:13:55 -0000	1.27
+++ winscard.c	10 Jun 2004 14:57:47 -0000	1.28
@@ -16,15 +16,14 @@
 #include <sys/time.h>
 #include <string.h>
 
-#include "wintypes.h"
-#include "pcsclite.h"
-#include "winscard.h"
+#include "PCSC/pcsclite.h"
+#include "PCSC/winscard.h"
+#include "PCSC/ifdhandler.h"
+#include "PCSC/debuglog.h"
 #include "readerfactory.h"
 #include "prothandler.h"
-#include "ifdhandler.h"
 #include "ifdwrapper.h"
 #include "atrhandler.h"
-#include "debuglog.h"
 #include "configfile.h"
 #include "sys_generic.h"
 

Index: winscard_clnt.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_clnt.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- winscard_clnt.c	5 Jun 2004 15:43:11 -0000	1.36
+++ winscard_clnt.c	10 Jun 2004 14:57:47 -0000	1.37
@@ -21,10 +21,9 @@
 #include <sys/un.h>
 #include <errno.h>
 
-#include "wintypes.h"
-#include "pcsclite.h"
-#include "winscard.h"
-#include "debuglog.h"
+#include "PCSC/pcsclite.h"
+#include "PCSC/winscard.h"
+#include "PCSC/debuglog.h"
 #include "thread_generic.h"
 
 #include "readerfactory.h"

Index: winscard_msg.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_msg.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- winscard_msg.c	25 May 2004 12:44:30 -0000	1.22
+++ winscard_msg.c	10 Jun 2004 14:57:47 -0000	1.23
@@ -28,12 +28,11 @@
 #include <sys/filio.h>
 #endif
 
-#include "wintypes.h"
-#include "pcsclite.h"
-#include "winscard.h"
+#include "PCSC/pcsclite.h"
+#include "PCSC/winscard.h"
+#include "PCSC/debuglog.h"
 #include "winscard_msg.h"
 #include "sys_generic.h"
-#include "debuglog.h"
 
 static int commonSocket = 0;
 

Index: winscard_scf.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_scf.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- winscard_scf.c	5 Jun 2004 15:52:11 -0000	1.11
+++ winscard_scf.c	10 Jun 2004 14:57:47 -0000	1.12
@@ -19,10 +19,9 @@
 #include <sys/un.h>
 #include <smartcard/scf.h>
 
-#include "wintypes.h"
-#include "pcsclite.h"
-#include "winscard.h"
-#include "debuglog.h"
+#include "PCSC/pcsclite.h"
+#include "PCSC/winscard.h"
+#include "PCSC/debuglog.h"
 
 #ifdef USE_THREAD_SAFETY
 #include "thread_generic.h"

Index: winscard_svc.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_svc.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- winscard_svc.c	26 May 2004 20:53:38 -0000	1.25
+++ winscard_svc.c	10 Jun 2004 14:57:47 -0000	1.26
@@ -17,12 +17,11 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "wintypes.h"
-#include "pcsclite.h"
-#include "winscard.h"
+#include "PCSC/pcsclite.h"
+#include "PCSC/winscard.h"
+#include "PCSC/debuglog.h"
 #include "winscard_msg.h"
 #include "winscard_svc.h"
-#include "debuglog.h"
 #include "sys_generic.h"
 #include "thread_generic.h"