[Pcsclite-cvs-commit] PCSC/src/PCSC mscdefines.h,1.8,1.9 musclecard.h,1.17,1.18 winscard.h,1.11,1.12

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


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

Modified Files:
	mscdefines.h musclecard.h winscard.h 
Log Message:
simplify:
  #if defined(__APPLE__)
  #include <PCSC/wintypes.h>
  #else
  #include <wintypes.h>
  #endif
since we now use PCSC/ for all Unix platforms


Index: mscdefines.h
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/PCSC/mscdefines.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- mscdefines.h	31 Mar 2004 09:42:30 -0000	1.8
+++ mscdefines.h	10 Jun 2004 18:06:35 -0000	1.9
@@ -20,11 +20,7 @@
 {
 #endif
 
-#if defined(__APPLE__)
 #include <PCSC/winscard.h>
-#else
-#include <winscard.h>
-#endif
 
 #ifndef MAX_BUFFER_SIZE
 #define MAX_BUFFER_SIZE		265

Index: musclecard.h
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/PCSC/musclecard.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- musclecard.h	10 May 2004 13:14:30 -0000	1.17
+++ musclecard.h	10 Jun 2004 18:06:35 -0000	1.18
@@ -24,11 +24,7 @@
 #include "PCSC.h"
 #endif
 
-#if defined(__APPLE__)
 #include <PCSC/mscdefines.h>
-#else
-#include <mscdefines.h>
-#endif
 
 /*
  * PCSC_API is defined for Windows but is a no-op on other

Index: winscard.h
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/PCSC/winscard.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- winscard.h	5 Jun 2004 15:43:11 -0000	1.11
+++ winscard.h	10 Jun 2004 18:06:35 -0000	1.12
@@ -13,11 +13,7 @@
 #ifndef __winscard_h__
 #define __winscard_h__
 
-#if defined(__APPLE__)
 #include <PCSC/pcsclite.h>
-#else
-#include <pcsclite.h>
-#endif
 
 #ifdef __cplusplus
 extern "C"