[Pcsclite-cvs-commit] PCSC/src winscard_clnt.c,1.24,1.25 winscard_svc.c,1.17,1.18

aet-guest@quantz.debian.org aet-guest@quantz.debian.org
Thu, 22 Jan 2004 15:32:10 +0100


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

Modified Files:
	winscard_clnt.c winscard_svc.c 
Log Message:
- Simplify the psContext/psContextMap declarations to fix
  build conflicts against some operating systems headers.


Index: winscard_clnt.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_clnt.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- winscard_clnt.c	16 Jan 2004 11:18:31 -0000	1.24
+++ winscard_clnt.c	22 Jan 2004 14:32:07 -0000	1.25
@@ -44,7 +44,7 @@
 
 typedef struct _psChannelMap CHANNEL_MAP, *PCHANNEL_MAP;
 
-struct _psContextMap
+static struct _psContextMap
 {
 	DWORD dwClientID;
 	SCARDCONTEXT hContext;
@@ -52,11 +52,7 @@
 	PCSCLITE_THREAD_T TID;            /* Thread owner of this context */
 	PCSCLITE_MUTEX_T mMutex;          /* Mutex for this context */
 	CHANNEL_MAP psChannelMap[PCSCLITE_MAX_APPLICATION_CONTEXT_CHANNELS];
-};
-
-typedef struct _psContextMap CONTEXT_MAP, *PCONTEXT_MAP;
-
-static CONTEXT_MAP psContextMap[PCSCLITE_MAX_APPLICATION_CONTEXTS];
+} psContextMap[PCSCLITE_MAX_APPLICATION_CONTEXTS];
 
 static short isExecuted = 0;
 static int mapAddr = 0;

Index: winscard_svc.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_svc.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- winscard_svc.c	16 Jan 2004 11:20:36 -0000	1.17
+++ winscard_svc.c	22 Jan 2004 14:32:07 -0000	1.18
@@ -25,18 +25,14 @@
 #include "sys_generic.h"
 #include "thread_generic.h"
 
-struct _psContext
+static struct _psContext
 {
 	SCARDCONTEXT hContext;
 	SCARDHANDLE hCard[PCSCLITE_MAX_APPLICATION_CONTEXT_CHANNELS];
 	DWORD dwClientID;
 	PCSCLITE_THREAD_T pthThread;	/* Event polling thread */
 	sharedSegmentMsg msgStruct;
-};
-
-typedef struct _psContext CONTEXT, *PCONTEXT;
-
-static CONTEXT psContext[PCSCLITE_MAX_APPLICATIONS_CONTEXTS];
+} psContext[PCSCLITE_MAX_APPLICATIONS_CONTEXTS];
 
 static DWORD dwNextContextIndex;
 
@@ -52,7 +48,7 @@
 
 LONG ContextsInitialize()
 {
-	memset(psContext, 0, sizeof(CONTEXT)*PCSCLITE_MAX_APPLICATIONS_CONTEXTS);
+	memset(psContext, 0, sizeof(struct _psContext)*PCSCLITE_MAX_APPLICATIONS_CONTEXTS);
 	return 1;
 }