[Pcsclite-cvs-commit] PCSC/src/utils bundleTool.c,1.8,1.9 formaticc.c,1.7,1.8 installifd.c,1.6,1.7

[aet-guest@quantz.debian.org]

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

Modified Files:
	bundleTool.c formaticc.c installifd.c 
Log Message:
Build fix for MacOS X, don't bother including
from <PCSC/..>, use standard header locations.


Index: bundleTool.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/utils/bundleTool.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- bundleTool.c	7 Sep 2003 18:06:58 -0000	1.8
+++ bundleTool.c	8 Sep 2003 11:21:14 -0000	1.9
@@ -25,11 +25,8 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <stdlib.h>
-#if defined(__APPLE__)
-#include <PCSC/winscard.h>
-#else
+#include <wintypes.h>
 #include <winscard.h>
-#endif
 
 /*
  * The following defines personalize this for different tokens 

Index: formaticc.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/utils/formaticc.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- formaticc.c	8 Sep 2003 08:50:50 -0000	1.7
+++ formaticc.c	8 Sep 2003 11:21:14 -0000	1.8
@@ -16,11 +16,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#if defined(__APPLE__)
-#include <PCSC/winscard.h>
-#else
+#include <wintypes.h>
 #include <winscard.h>
-#endif
 #include "configfile.h"
 
 #ifndef MAXHOSTNAMELEN

Index: installifd.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/utils/installifd.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- installifd.c	7 Sep 2003 18:06:58 -0000	1.6
+++ installifd.c	8 Sep 2003 11:21:14 -0000	1.7
@@ -21,11 +21,8 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <errno.h>
-#if defined(__APPLE__)
-#include <PCSC/winscard.h>
-#else
+#include <wintypes.h>
 #include <winscard.h>
-#endif
 
 #ifndef PCSCLITE_READER_CONFIG
 #define PCSCLITE_READER_CONFIG "/etc/reader.conf"