[Pcsclite-cvs-commit] PCSC/src atrhandler.c,1.4,1.5 atrhandler.h,1.2,1.3 debuglog.c,1.12,1.13 dyn_hpux.c,1.3,1.4 dyn_macosx.c,1.2,1.3 dyn_unix.c,1.4,1.5 dyn_win32.c,1.3,1.4 eventhandler.c,1.11,1.12 hotplug_generic.c,1.3,1.4 hotplug_libusb.c,1.8,1.9 hotplug_linux.c,1.13,1.14 hotplug_macosx.c,1.8,1.9 mscdefines.h,1.5,1.6 musclecard.c,1.30,1.31 musclecard.h,1.14,1.15 muscletest.c,1.5,1.6 pcsclite.h,1.19,1.20 powermgt_macosx.c,1.8,1.9 prothandler.c,1.4,1.5 readerfactory.c,1.15,1.16 sys_unix.c,1.5,1.6 testpcsc.c,1.2,1.3 thread_generic.h,1.6,1.7 thread_unix.c,1.5,1.6 tokenfactory.c,1.10,1.11 tokenparser.l,1.7,1.8 winscard.c,1.16,1.17 winscard.h,1.5,1.6 winscard_clnt.c,1.12,1.13 winscard_msg.c,1.6,1.7 winscard_scf.c,1.2,1.3 winscard_svc.c,1.5,1.6 wintypes.h,1.5,1.6
aet-guest@quantz.debian.org
aet-guest@quantz.debian.org
Sun, 07 Sep 2003 20:07:01 +0200
Update of /cvsroot/pcsclite/PCSC/src
In directory quantz:/tmp/cvs-serv31608/src
Modified Files:
atrhandler.c atrhandler.h debuglog.c dyn_hpux.c dyn_macosx.c
dyn_unix.c dyn_win32.c eventhandler.c hotplug_generic.c
hotplug_libusb.c hotplug_linux.c hotplug_macosx.c mscdefines.h
musclecard.c musclecard.h muscletest.c pcsclite.h
powermgt_macosx.c prothandler.c readerfactory.c sys_unix.c
testpcsc.c thread_generic.h thread_unix.c tokenfactory.c
tokenparser.l winscard.c winscard.h winscard_clnt.c
winscard_msg.c winscard_scf.c winscard_svc.c wintypes.h
Log Message:
- Cleanups for #include logic and ordering,
it's better to include config.h first.
Index: atrhandler.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/atrhandler.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- atrhandler.c 30 Oct 2002 17:42:41 -0000 1.4
+++ atrhandler.c 7 Sep 2003 18:06:58 -0000 1.5
@@ -11,10 +11,10 @@
********************************************************************/
+#include "config.h"
#include <syslog.h>
#include <string.h>
-#include "config.h"
#include "wintypes.h"
#include "pcsclite.h"
#include "atrhandler.h"
Index: atrhandler.h
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/atrhandler.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- atrhandler.h 4 Apr 2002 19:03:36 -0000 1.2
+++ atrhandler.h 7 Sep 2003 18:06:58 -0000 1.3
@@ -94,4 +94,4 @@
}
#endif
-#endif /* __smclib_h__ */
+#endif /* __atrhandler_h__ */
Index: debuglog.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/debuglog.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- debuglog.c 5 Sep 2003 21:06:22 -0000 1.12
+++ debuglog.c 7 Sep 2003 18:06:58 -0000 1.13
@@ -13,11 +13,11 @@
********************************************************************/
-#ifndef WIN32
+#include "config.h"
+#ifdef HAVE_SYSLOG_H
#include <syslog.h>
-#include <unistd.h>
#endif
-
+#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -25,19 +25,8 @@
#include <assert.h>
#include <sys/types.h>
-#ifndef WIN32
-#include "config.h"
#include "wintypes.h"
-#else
-#include "../win32/win32_config.h"
-#endif
-
-#ifdef WIN32
-#include "../win32/win32_pcsclite.h"
-#else
#include "pcsclite.h"
-#endif
-
#include "debuglog.h"
// Max string size when dumping a 256 bytes longs APDU
@@ -334,14 +323,9 @@
}
#ifdef WIN32
-static DWORD getPID() {
+static DWORD SYS_GetPID() {
return GetCurrentProcessId();
}
-
-#else
-static pid_t getPID() {
- return getpid();
-}
#endif
void DebugLogSetupLogFile(const char* filename_base) {
@@ -359,7 +343,7 @@
debug_file = NULL;
}
- sprintf(filename, "%s.%20d", filename_base, getPID());
+ sprintf(filename, "%s.%20d", filename_base, SYS_GetPID());
debug_file = fopen(filename, "a");
/* In debug mode, catch the case where we couldn't open the file */
@@ -369,4 +353,3 @@
free(filename);
}
-
Index: dyn_hpux.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/dyn_hpux.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dyn_hpux.c 28 May 2002 05:00:57 -0000 1.3
+++ dyn_hpux.c 7 Sep 2003 18:06:58 -0000 1.4
@@ -12,11 +12,11 @@
********************************************************************/
+#include "config.h"
#include <string.h>
#include <dl.h>
#include <errno.h>
-#include "config.h"
#include "wintypes.h"
#include "pcsclite.h"
#include "dyn_generic.h"
Index: dyn_macosx.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/dyn_macosx.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dyn_macosx.c 4 Apr 2002 19:03:36 -0000 1.2
+++ dyn_macosx.c 7 Sep 2003 18:06:58 -0000 1.3
@@ -12,11 +12,11 @@
********************************************************************/
+#include "config.h"
#include <CoreFoundation/CFBundle.h>
#include <CoreFoundation/CFString.h>
#include <CoreFoundation/CFURL.h>
-#include "config.h"
#include "wintypes.h"
#include "pcsclite.h"
#include "dyn_generic.h"
Index: dyn_unix.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/dyn_unix.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dyn_unix.c 7 Sep 2003 17:20:22 -0000 1.4
+++ dyn_unix.c 7 Sep 2003 18:06:58 -0000 1.5
@@ -12,11 +12,11 @@
********************************************************************/
+#include "config.h"
#include <string.h>
#include <dlfcn.h>
#include <stdlib.h>
-#include "config.h"
#include "wintypes.h"
#include "pcsclite.h"
#include "dyn_generic.h"
Index: dyn_win32.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/dyn_win32.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dyn_win32.c 7 Sep 2003 17:20:22 -0000 1.3
+++ dyn_win32.c 7 Sep 2003 18:06:58 -0000 1.4
@@ -13,9 +13,9 @@
********************************************************************/
+#include "config.h"
#include <string.h>
-#include "../win32/win32_config.h"
#include "windows.h"
#include <winscard.h>
#include "dyn_generic.h"
Index: eventhandler.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/eventhandler.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- eventhandler.c 19 Aug 2003 07:45:58 -0000 1.11
+++ eventhandler.c 7 Sep 2003 18:06:58 -0000 1.12
@@ -14,6 +14,7 @@
********************************************************************/
+#include "config.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
@@ -21,7 +22,6 @@
#include <string.h>
#include <stdlib.h>
-#include "config.h"
#include "wintypes.h"
#include "pcsclite.h"
#include "thread_generic.h"
Index: hotplug_generic.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/hotplug_generic.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hotplug_generic.c 19 Aug 2003 09:27:43 -0000 1.3
+++ hotplug_generic.c 7 Sep 2003 18:06:58 -0000 1.4
@@ -12,10 +12,9 @@
$Id$
********************************************************************/
+#include "config.h"
#include "wintypes.h"
#include "pcsclite.h"
-
-#include "config.h"
LONG HPSearchHotPluggables(void)
{
Index: hotplug_libusb.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/hotplug_libusb.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- hotplug_libusb.c 7 Sep 2003 17:34:42 -0000 1.8
+++ hotplug_libusb.c 7 Sep 2003 18:06:58 -0000 1.9
@@ -15,6 +15,7 @@
********************************************************************/
+#include "config.h"
#include <string.h>
#include <sys/types.h>
#include <stdio.h>
@@ -26,7 +27,6 @@
#include <errno.h>
#include <usb.h>
-#include "config.h"
#include "wintypes.h"
#include "pcsclite.h"
#include "readerfactory.h"
Index: hotplug_linux.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/hotplug_linux.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- hotplug_linux.c 21 Aug 2003 17:27:53 -0000 1.13
+++ hotplug_linux.c 7 Sep 2003 18:06:58 -0000 1.14
@@ -15,6 +15,7 @@
********************************************************************/
+#include "config.h"
#include <string.h>
#include <sys/types.h>
#include <stdio.h>
@@ -24,7 +25,6 @@
#include <stdlib.h>
#include <unistd.h>
-#include "config.h"
#include "wintypes.h"
#include "pcsclite.h"
#include "readerfactory.h"
Index: hotplug_macosx.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/hotplug_macosx.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- hotplug_macosx.c 20 Aug 2003 08:12:59 -0000 1.8
+++ hotplug_macosx.c 7 Sep 2003 18:06:58 -0000 1.9
@@ -13,6 +13,7 @@
$Id$
********************************************************************/
+#include "config.h"
#include <CoreFoundation/CoreFoundation.h>
#include <IOKit/IOCFPlugIn.h>
#include <IOKit/IOKitLib.h>
@@ -20,7 +21,6 @@
#include <stdlib.h>
#include <string.h>
-#include "config.h"
#include "wintypes.h"
#include "pcsclite.h"
#include "debuglog.h"
Index: mscdefines.h
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/mscdefines.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mscdefines.h 6 May 2002 23:01:23 -0000 1.5
+++ mscdefines.h 7 Sep 2003 18:06:58 -0000 1.6
@@ -23,17 +23,13 @@
{
#endif
-#ifdef WIN32
-#include "../win32/win32_pcsclite.h"
-#endif
-
-#ifndef __APPLE__
-#include <winscard.h>
-#else
+#if defined(__APPLE__)
#include <PCSC/winscard.h>
+#else
+#include <winscard.h>
#endif
-#ifdef MSC_ARCH_WIN32
+#ifndef MAX_BUFFER_SIZE
#define MAX_BUFFER_SIZE 265
#endif
Index: musclecard.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/musclecard.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- musclecard.c 28 Aug 2003 13:32:29 -0000 1.30
+++ musclecard.c 7 Sep 2003 18:06:58 -0000 1.31
@@ -18,20 +18,17 @@
********************************************************************/
-#ifndef WIN32
#include "config.h"
-#else
-#include "../win32/win32_config.h"
-#endif
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
#include "musclecard.h"
#include "tokenfactory.h"
#include "debuglog.h"
#ifdef USE_THREAD_SAFETY
-#ifndef WIN32
#include "wintypes.h"
-#endif
#include "thread_generic.h"
#include "sys_generic.h"
#endif
@@ -46,10 +43,6 @@
#endif
static PCSCLITE_THREAD_T callbackThread;
#endif
-
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
static SCARDCONTEXT localHContext = 0;
static ULONG blockingContext = MSC_BLOCKSTATUS_RESUME;
Index: musclecard.h
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/musclecard.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- musclecard.h 15 Aug 2003 20:07:53 -0000 1.14
+++ musclecard.h 7 Sep 2003 18:06:58 -0000 1.15
@@ -26,10 +26,10 @@
#include "PCSC.h"
#endif
-#ifndef __APPLE__
-#include "mscdefines.h"
-#else
+#if defined(__APPLE__)
#include <PCSC/mscdefines.h>
+#else
+#include <mscdefines.h>
#endif
/*
Index: muscletest.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/muscletest.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- muscletest.c 4 Sep 2003 20:33:19 -0000 1.5
+++ muscletest.c 7 Sep 2003 18:06:58 -0000 1.6
@@ -23,7 +23,7 @@
#define MY_OBJECT_ID "c1"
#define MY_OBJECT_SIZE 50
-#ifdef MSC_ARCH_WIN32
+#ifdef WIN32
MSCString pcsc_stringify_error(MSCLong32 Error);
#endif
@@ -246,7 +246,7 @@
return 0;
}
-#ifdef MSC_ARCH_WIN32
+#ifdef WIN32
MSCString pcsc_stringify_error(MSCLong32 Error)
{
Index: pcsclite.h
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/pcsclite.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- pcsclite.h 4 Sep 2003 20:52:00 -0000 1.19
+++ pcsclite.h 7 Sep 2003 18:06:58 -0000 1.20
@@ -18,13 +18,11 @@
#ifndef __pcsclite_h__
#define __pcsclite_h__
-//#ifndef __APPLE__
-#ifdef WIN32
-#include <windows.h>
+#if defined(__APPLE__)
+#include <PCSC/wintypes.h>
#else
#include <wintypes.h>
#endif
-//#endif
#ifdef __cplusplus
extern "C"
@@ -223,4 +221,3 @@
#endif
#endif
-
Index: powermgt_macosx.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/powermgt_macosx.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- powermgt_macosx.c 19 Aug 2003 09:27:43 -0000 1.8
+++ powermgt_macosx.c 7 Sep 2003 18:06:58 -0000 1.9
@@ -19,10 +19,8 @@
*
* @APPLE_LICENSE_HEADER_END@
*/
-/*
-cc test2.c -o pm_callback -Wall -Wno-four-char-constants -framework IOKit -framework CoreFoundation
-*/
+#include "config.h"
#include <ctype.h>
#include <stdlib.h>
#include <stdio.h>
@@ -34,7 +32,6 @@
#include <IOKit/pwr_mgt/IOPMLib.h>
#include <IOKit/IOMessage.h>
-#include "config.h"
#include "wintypes.h"
#include "pcsclite.h"
#include "debuglog.h"
Index: prothandler.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/prothandler.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- prothandler.c 30 Oct 2002 17:45:34 -0000 1.4
+++ prothandler.c 7 Sep 2003 18:06:58 -0000 1.5
@@ -10,9 +10,9 @@
********************************************************************/
+#include "config.h"
#include <string.h>
-#include "config.h"
#include "wintypes.h"
#include "pcsclite.h"
#include "readerfactory.h"
Index: readerfactory.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/readerfactory.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- readerfactory.c 2 Oct 2002 21:15:43 -0000 1.15
+++ readerfactory.c 7 Sep 2003 18:06:58 -0000 1.16
@@ -14,6 +14,7 @@
********************************************************************/
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -23,7 +24,6 @@
#include <sys/errno.h>
#include <fcntl.h>
-#include "config.h"
#include "wintypes.h"
#include "pcsclite.h"
#include "thread_generic.h"
@@ -33,9 +33,6 @@
#include "eventhandler.h"
#include "ifdhandler.h"
#include "ifdwrapper.h"
-/*
- * FIX :: This should go
- */
#include "debuglog.h"
static PREADER_CONTEXT sContexts[PCSCLITE_MAX_CONTEXTS];
Index: sys_unix.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/sys_unix.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sys_unix.c 7 Sep 2003 17:20:22 -0000 1.5
+++ sys_unix.c 7 Sep 2003 18:06:58 -0000 1.6
@@ -13,6 +13,7 @@
********************************************************************/
+#include "config.h"
#include <sys_generic.h>
#include <sys/types.h>
#include <sys/mman.h>
@@ -27,8 +28,6 @@
#include <stdlib.h>
#include <signal.h>
#include <time.h>
-
-#include "config.h"
int SYS_Initialize()
{
Index: testpcsc.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/testpcsc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- testpcsc.c 4 Apr 2002 19:03:36 -0000 1.2
+++ testpcsc.c 7 Sep 2003 18:06:58 -0000 1.3
@@ -12,10 +12,10 @@
********************************************************************/
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
-#include "config.h"
#include "pcsclite.h"
#include "winscard.h"
Index: thread_generic.h
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/thread_generic.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- thread_generic.h 7 Sep 2003 17:20:22 -0000 1.6
+++ thread_generic.h 7 Sep 2003 18:06:58 -0000 1.7
@@ -17,7 +17,6 @@
#ifdef WIN32
#include <windows.h>
#include "PCSC.h"
-
#else
#include <pthread.h>
#define PCSC_API
@@ -32,7 +31,6 @@
#define PCSCLITE_THREAD_T HANDLE
#define PCSCLITE_MUTEX CRITICAL_SECTION
#define PCSCLITE_MUTEX_T CRITICAL_SECTION*
-
#else
#define PCSCLITE_THREAD_T pthread_t
#define PCSCLITE_MUTEX pthread_mutex_t
Index: thread_unix.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/thread_unix.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- thread_unix.c 7 Sep 2003 17:20:22 -0000 1.5
+++ thread_unix.c 7 Sep 2003 18:06:58 -0000 1.6
@@ -11,12 +11,7 @@
********************************************************************/
-#ifndef WIN32
#include "config.h"
-#else
-#include "../win32/win32_config.h"
-#endif
-
#include "wintypes.h"
#include "pcsclite.h"
#include "thread_generic.h"
Index: tokenfactory.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/tokenfactory.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- tokenfactory.c 7 Sep 2003 17:34:42 -0000 1.10
+++ tokenfactory.c 7 Sep 2003 18:06:58 -0000 1.11
@@ -11,16 +11,13 @@
*******************************************************************/
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
-
-#ifndef WIN32
+#ifdef HAVE_DIRENT_H
#include <dirent.h>
-#include "config.h"
-#else
-#include "../win32/win32_config.h"
#endif
#include "debuglog.h"
Index: tokenparser.l
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/tokenparser.l,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- tokenparser.l 11 Aug 2003 09:55:58 -0000 1.7
+++ tokenparser.l 7 Sep 2003 18:06:58 -0000 1.8
@@ -13,6 +13,11 @@
%{
+#include "config.h"
+#include <stdio.h>
+#include <string.h>
+
+#include "debuglog.h"
#include "parser.h"
void tpevalToken(char *pcToken, int tokType);
@@ -38,10 +43,6 @@
. { tperrorCheck( yytext ); }
%%
-#include <stdio.h>
-#include <string.h>
-#include "debuglog.h"
-#include "config.h"
int yywrap()
{
Index: winscard.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- winscard.c 25 Aug 2003 08:55:37 -0000 1.16
+++ winscard.c 7 Sep 2003 18:06:58 -0000 1.17
@@ -16,11 +16,11 @@
********************************************************************/
+#include "config.h"
#include <stdlib.h>
#include <sys/time.h>
#include <string.h>
-#include "config.h"
#include "wintypes.h"
#include "pcsclite.h"
#include "winscard.h"
Index: winscard.h
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- winscard.h 4 Sep 2003 18:34:33 -0000 1.5
+++ winscard.h 7 Sep 2003 18:06:58 -0000 1.6
@@ -18,11 +18,11 @@
#ifndef __winscard_h__
#define __winscard_h__
-//#ifndef __APPLE__
+#if defined(__APPLE__)
+#include <PCSC/pcsclite.h>
+#else
#include <pcsclite.h>
-//#else
-//#include <PCSC/pcsclite.h>
-//#endif
+#endif
#ifdef __cplusplus
extern "C"
Index: winscard_clnt.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_clnt.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- winscard_clnt.c 3 Sep 2003 21:10:50 -0000 1.12
+++ winscard_clnt.c 7 Sep 2003 18:06:58 -0000 1.13
@@ -14,6 +14,7 @@
********************************************************************/
+#include "config.h"
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
@@ -22,7 +23,6 @@
#include <sys/un.h>
#include <errno.h>
-#include "config.h"
#include "wintypes.h"
#include "pcsclite.h"
#include "winscard.h"
Index: winscard_msg.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_msg.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- winscard_msg.c 7 Sep 2003 17:34:42 -0000 1.6
+++ winscard_msg.c 7 Sep 2003 18:06:58 -0000 1.7
@@ -12,6 +12,7 @@
********************************************************************/
+#include "config.h"
#include <fcntl.h>
#include <unistd.h>
#include <sys/types.h>
@@ -25,9 +26,6 @@
#include <stdio.h>
#include <time.h>
#include <string.h>
-
-#include "config.h"
-
#ifdef HAVE_SYS_FILIO_H
#include <sys/filio.h>
#endif
Index: winscard_scf.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_scf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- winscard_scf.c 4 Oct 2002 20:47:00 -0000 1.2
+++ winscard_scf.c 7 Sep 2003 18:06:58 -0000 1.3
@@ -12,41 +12,40 @@
Copy this file to pcsc-lite../src/winscard_clnt.c
********************************************************************/
-#include <wintypes.h>
-#include <pcsclite.h>
-#include <winscard.h>
-
-#define USE_THREAD_SAFETY
-
-#ifdef USE_THREAD_SAFETY
-#include <thread_generic.h>
-#endif
+#include "config.h"
#include <stdlib.h>
#include <string.h>
-#include <readerfactory.h>
-#include <eventhandler.h>
-#include <sys_generic.h>
#include <sys/types.h>
-
-//#include <winscard_msg.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/un.h>
+#include <smartcard/scf.h>
+#include "wintypes.h"
+#include "pcsclite.h"
+#include "winscard.h"
+#include "debuglog.h"
+
+#define USE_THREAD_SAFETY
+#ifdef USE_THREAD_SAFETY
+#include "thread_generic.h"
+#endif
+
+#include "readerfactory.h"
+#include "eventhandler.h"
+#include "sys_generic.h"
-/*scf includes*/
-#include <scf.h>
#define TRUE 1
#define FALSE 0
+
#define PCSC_SCF_MAX_READERS 2
#define PCSC_SCF_MAX_ATR_BUFFER_LENGTH 32
#define PCSC_SCF_MAX_RECV_LEN 265
-
//Global session to manage Readers, Card events.
static SCF_Session_t g_hSession = NULL;
-//Hvae to deifne this because they are defined in pcsclite.h as externs
+//Have to define this because they are defined in pcsclite.h as externs
SCARD_IO_REQUEST g_rgSCardT0Pci, g_rgSCardT1Pci, g_rgSCardRawPci;
static struct _psTransmitMap {
Index: winscard_svc.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_svc.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- winscard_svc.c 20 Aug 2003 15:14:18 -0000 1.5
+++ winscard_svc.c 7 Sep 2003 18:06:58 -0000 1.6
@@ -13,10 +13,10 @@
********************************************************************/
+#include "config.h"
#include <time.h>
#include <stdio.h>
-#include "config.h"
#include "wintypes.h"
#include "pcsclite.h"
#include "winscard.h"
Index: wintypes.h
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/wintypes.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- wintypes.h 20 Aug 2003 14:49:28 -0000 1.5
+++ wintypes.h 7 Sep 2003 18:06:58 -0000 1.6
@@ -20,6 +20,8 @@
{
#endif
+#if !defined(WIN32)
+
#ifndef BYTE
typedef unsigned char BYTE;
#endif
@@ -37,7 +39,7 @@
typedef const void *LPCVOID;
typedef unsigned long DWORD;
typedef unsigned long *PDWORD;
- typedef unsigned short WORD; /* H. Bragstad Schlumberger */
+ typedef unsigned short WORD;
typedef long LONG;
typedef long RESPONSECODE;
typedef const char *LPCSTR;
@@ -45,9 +47,10 @@
typedef BYTE *LPBYTE;
typedef DWORD *LPDWORD;
typedef char *LPSTR;
- //typedef unsigned short WCHAR;
- //typedef WCHAR * LPTSTR;
- //typedef const WCHAR * LPCWSTR;
+
+#else
+#include <windows.h>
+#endif
#ifdef __cplusplus
}