2006-10-26 Marcus Brinkmann <marcus@g10code.de>

	* src/p11-getinfo.c (CRYPTOKI_VERSION_MAJOR,
	CRYPTOKI_VERSION_MINOR): Move macros to ...
	* src/cryptoki.h (CRYPTOKI_VERSION_MAJOR, CRYPTOKI_VERSION_MINOR):
	... here

ChangeLog

@@ -1,5 +1,10 @@
 2006-10-26  Marcus Brinkmann  <marcus@g10code.de>
 
+	* src/p11-getinfo.c (CRYPTOKI_VERSION_MAJOR,
+	CRYPTOKI_VERSION_MINOR): Move macros to ...
+	* src/cryptoki.h (CRYPTOKI_VERSION_MAJOR, CRYPTOKI_VERSION_MINOR):
+	... here
+
 	* src/gpgsm.c (gpgsm_get_cert): Rename to ...
 	(scute_gpgsm_get_cert): ... this.
 	* src/gpgsm.h: New file.

src/cryptoki.h

@@ -33,6 +33,11 @@
 #ifndef _CRYPTOKI_H_
 #define _CRYPTOKI_H_	1
 
+/* The version of cryptoki we implement.  */
+#define CRYPTOKI_VERSION_MAJOR	2
+#define CRYPTOKI_VERSION_MINOR	20
+
+
 #define CK_DISABLE_TRUE_FALSE	1
 
 #ifdef HAVE_W32_SYSTEM

src/p11-getinfo.c

@@ -40,11 +40,6 @@
 #include "settings.h"
 
 
-/* The version of cryptoki we implement.  */
-#define CRYPTOKI_VERSION_MAJOR	2
-#define CRYPTOKI_VERSION_MINOR	20
-
-
 CK_DEFINE_FUNCTION(CK_RV, C_GetInfo)(CK_INFO_PTR pInfo)
 {
   if (pInfo == NULL_PTR)