2008-08-08 Marcus Brinkmann <marcus@g10code.de>

	* src/cryptoki.h (CRYPTOKI_EXPORTS): Define symbol.
	* src/error-mapping.h: Do not include <error.h>.
	(scute_sys_to_ck): Change type of ERR to int.
	* src/error-mapping.c: Do not include <error.h>.
	(scute_sys_to_ck): Change type of ERR to int.
	* src/slots.c (slot_create_session): Change type of ERR to int.

ChangeLog

@@ -1,3 +1,12 @@
+2008-08-08  Marcus Brinkmann  <marcus@g10code.de>
+
+	* src/cryptoki.h (CRYPTOKI_EXPORTS): Define symbol.
+	* src/error-mapping.h: Do not include <error.h>.
+	(scute_sys_to_ck): Change type of ERR to int.
+	* src/error-mapping.c: Do not include <error.h>.
+	(scute_sys_to_ck): Change type of ERR to int.
+	* src/slots.c (slot_create_session): Change type of ERR to int.
+
 2007-05-03  Marcus Brinkmann  <marcus@g10code.de>
 
 	Released version 1.1.0.

src/cryptoki.h

@@ -31,6 +31,7 @@
 #define _CRYPTOKI_H_	1
 
 
+#define CRYPTOKI_EXPORTS
 #include "pkcs11.h"
 
 #endif	/* !_CRYPTOKI_H_ */

src/error-mapping.c

@@ -32,7 +32,6 @@
 #endif
 
 #include <errno.h>
-#include <error.h>
 
 #include <gpg-error.h>
 
@@ -44,7 +43,7 @@
 
 /* Map a system error code to a cryptoki return value.  */
 CK_RV
-scute_sys_to_ck (error_t err)
+scute_sys_to_ck (int err)
 {
   switch (err)
     {

src/error-mapping.h

@@ -31,14 +31,13 @@
 #define ERROR_MAPPING_H	1
 
 #include <errno.h>
-#include <error.h>
 
 #include <gpg-error.h>
 
 #include "cryptoki.h"
 
 /* Map a system error code to a cryptoki return value.  */
-CK_RV scute_sys_to_ck (error_t err);
+CK_RV scute_sys_to_ck (int err);
 
 /* Map a GnuPG error code to a cryptoki return value.  */
 CK_RV scute_gpg_err_to_ck (gpg_error_t err);

src/slots.c

@@ -729,7 +729,7 @@ CK_RV
 slot_create_session (slot_iterator_t id, session_iterator_t *session,
 		     bool rw)
 {
-  error_t err;
+  int err;
   struct slot *slot = scute_table_data (slots, id);
   unsigned int tsid;
   void *rawp;