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

[aet-guest@quantz.debian.org]

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

Modified Files:
	bundleTool.c formaticc.c installifd.c 
Log Message:
- Cleanups for #include logic and ordering,
  it's better to include config.h first.


Index: bundleTool.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/utils/bundleTool.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- bundleTool.c	2 Dec 2002 21:52:22 -0000	1.7
+++ bundleTool.c	7 Sep 2003 18:06:58 -0000	1.8
@@ -16,14 +16,7 @@
  
 ********************************************************************/
 
-#ifdef MSC_TARGET_OSX
-#include <PCSC/wintypes.h>
-#include <PCSC/winscard.h>
-#else
-#include <wintypes.h>
-#include <winscard.h>
-#endif
-
+#include "config.h"
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -32,8 +25,11 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <stdlib.h>
-
-#include "config.h"
+#if defined(__APPLE__)
+#include <PCSC/winscard.h>
+#else
+#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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- formaticc.c	6 Oct 2002 18:22:25 -0000	1.5
+++ formaticc.c	7 Sep 2003 18:06:58 -0000	1.6
@@ -16,10 +16,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#include <wintypes.h>
+#if defined(__APPLE__)
+#include <PCSC/winscard.h>
+#else
 #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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- installifd.c	14 Aug 2003 14:41:38 -0000	1.5
+++ installifd.c	7 Sep 2003 18:06:58 -0000	1.6
@@ -15,16 +15,21 @@
 
 ********************************************************************/
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <errno.h>
+#if defined(__APPLE__)
+#include <PCSC/winscard.h>
+#else
+#include <winscard.h>
+#endif
 
-#include "config.h"
-#include "pcsclite.h"
-
-#define CONFFILE "/etc/reader.conf"
+#ifndef PCSCLITE_READER_CONFIG
+#define PCSCLITE_READER_CONFIG "/etc/reader.conf"
+#endif
 
 int main(int argc, char *argv[])
 {
@@ -115,13 +120,13 @@
 	}
 
 	printf("\n\n");
-	printf("Now creating new " CONFFILE "\n");
+	printf("Now creating new " PCSCLITE_READER_CONFIG "\n");
 
-	fd = fopen(CONFFILE, "w");
+	fd = fopen(PCSCLITE_READER_CONFIG, "w");
 
 	if (fd == NULL)
 	{
-		printf("Cannot open file %s: %s\n", CONFFILE, strerror(errno));
+		printf("Cannot open file %s: %s\n", PCSCLITE_READER_CONFIG, strerror(errno));
 		free(lpcPortID);
 		return 1;
 	}