jjelen pushed to opencryptoki (f21). "Make inline function compatible for GCC5"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue May 5 09:28:21 UTC 2015


>From 28bd174a0eaa591329c22c1ba171d5465112cbd8 Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen at redhat.com>
Date: Mon, 4 May 2015 16:27:09 +0200
Subject: Make inline function compatible for GCC5


diff --git a/opencryptoki-3.2-missing-sources-and-libraries.patch b/opencryptoki-3.2-missing-sources-and-libraries.patch
index 511fcc1..6c21497 100644
--- a/opencryptoki-3.2-missing-sources-and-libraries.patch
+++ b/opencryptoki-3.2-missing-sources-and-libraries.patch
@@ -197,3 +197,15 @@ diff --git a/usr/lib/pkcs11/tpm_stdll/Makefile.am b/usr/lib/pkcs11/tpm_stdll/Mak
  					      ../common/loadsave.c	\
  					      ../common/utility.c	\
  					      ../common/mech_des.c	\
+diff --git a/usr/lib/pkcs11/common/btree.c b/usr/lib/pkcs11/common/btree.c
+--- a/usr/lib/pkcs11/common/btree.c
++++ b/usr/lib/pkcs11/common/btree.c
+@@ -242,7 +242,7 @@ bt_node_free(struct btree *t, unsigned long node_num, void (*delete_func)(void *
+  *
+  * return 0 if binary tree has at least 1 node in use, !0 otherwise
+  */
+-inline int
++extern inline int
+ bt_is_empty(struct btree *t)
+ {
+ 	return (t->free_nodes == t->size);
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/opencryptoki.git/commit/?h=f21&id=28bd174a0eaa591329c22c1ba171d5465112cbd8


More information about the scm-commits mailing list