[Pcsclite-cvs-commit] PKCS11/include crackcert.h,1.1,1.1.2.1 cryptoki.h,1.22,1.22.2.1 cryptoki_unix.h,1.2,1.2.4.1 cryptoki_win32.h,1.2,1.2.4.1 p11x_msc.h,1.4,1.4.2.1 thread_generic.h,1.2,1.2.2.1

[corcoran-guest@quantz.debian.org]

Update of /cvsroot/muscleapps/PKCS11/include
In directory quantz:/tmp/cvs-serv13260/include

Modified Files:
      Tag: corcoran-013004
	crackcert.h cryptoki.h cryptoki_unix.h cryptoki_win32.h 
	p11x_msc.h thread_generic.h 
Log Message:
Some bug fixes and changes placed on branch.  Passes test suite.




Index: crackcert.h
===================================================================
RCS file: /cvsroot/muscleapps/PKCS11/include/crackcert.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1

Index: cryptoki.h
===================================================================
RCS file: /cvsroot/muscleapps/PKCS11/include/cryptoki.h,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -d -r1.22 -r1.22.2.1

Index: cryptoki_unix.h
===================================================================
RCS file: /cvsroot/muscleapps/PKCS11/include/cryptoki_unix.h,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1

Index: cryptoki_win32.h
===================================================================
RCS file: /cvsroot/muscleapps/PKCS11/include/cryptoki_win32.h,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1

Index: p11x_msc.h
===================================================================
RCS file: /cvsroot/muscleapps/PKCS11/include/p11x_msc.h,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1

Index: thread_generic.h
===================================================================
RCS file: /cvsroot/muscleapps/PKCS11/include/thread_generic.h,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- thread_generic.h	5 Jun 2003 00:46:49 -0000	1.2
+++ thread_generic.h	31 Jan 2004 00:21:22 -0000	1.2.2.1
@@ -16,7 +16,12 @@
 
 #ifdef WIN32
 #include <windows.h>
-#include "PCSC.h"
+
+#ifdef PCSC_EXPORTS
+#define PCSC_API __declspec(dllexport)
+#else
+#define PCSC_API __declspec(dllimport)
+#endif
 
 #else
 #include <pthread.h>
@@ -46,7 +51,7 @@
 	int SYS_ThreadCreate(PCSCLITE_THREAD_T *, LPVOID, LPVOID, LPVOID);
 	int SYS_ThreadCancel(PCSCLITE_THREAD_T *);
 	int SYS_ThreadDetach(PCSCLITE_THREAD_T);
-        int SYS_ThreadJoin(PCSCLITE_THREAD_T *, LPVOID*);
+    int SYS_ThreadJoin(PCSCLITE_THREAD_T *, LPVOID*);
 	int SYS_ThreadExit(LPVOID);