[gnome-keyring/dbus-api] Fix build when p11-tests is not installed.



commit a3bce12d11b09e0a61da4d34dfeec59670d6c01e
Author: Stef Walter <stef memberwebs com>
Date:   Tue Nov 24 01:00:39 2009 +0000

    Fix build when p11-tests is not installed.

 tests/gtest-helpers.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/tests/gtest-helpers.c b/tests/gtest-helpers.c
index ae27114..7ca44e1 100644
--- a/tests/gtest-helpers.c
+++ b/tests/gtest-helpers.c
@@ -37,7 +37,11 @@
 
 #include "egg/egg-secure-memory.h"
 
+#include "pkcs11/pkcs11.h"
+
+#ifdef WITH_P11_TESTS
 #include <p11-tests.h>
+#endif
 
 /* Forward declaration */
 void test_p11_module (CK_FUNCTION_LIST_PTR module, const gchar *config);
@@ -183,11 +187,10 @@ test_p11_module (CK_FUNCTION_LIST_PTR module, const gchar *config)
 
 #else /* !WITH_P11_TESTS */
 
-gint
-test_p11_module (CK_FUNCTION_LIST_PTR module)
+void
+test_p11_module (CK_FUNCTION_LIST_PTR module, const gchar *config)
 {
 	g_message ("p11-tests support not built in");
-	return 0;
 }
 
 #endif /* !WITH_P11_TESTS */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]