[Pcsclite-cvs-commit] PCSC/src/utils bundleTool.c,1.11,1.12

[aet-guest@quantz.debian.org]

Update of /cvsroot/pcsclite/PCSC/src/utils
In directory quantz:/tmp/cvs-serv31531/src/utils

Modified Files:
	bundleTool.c 
Log Message:
- Allow regular pcsclite.h to be used under win32 platform


Index: bundleTool.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/utils/bundleTool.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- bundleTool.c	2 Nov 2003 20:05:31 -0000	1.11
+++ bundleTool.c	9 Nov 2003 13:33:49 -0000	1.12
@@ -15,7 +15,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
-#ifndef WIN32
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #ifdef HAVE_DIRENT_H
@@ -24,10 +24,7 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <stdlib.h>
-#include "wintypes.h"
-#ifdef SCARD_MS
-#include "win32_pcsclite.h"
-#endif
+#include "pcsclite.h"
 #include <winscard.h>
 
 /*