From d985860844a0b95029ff21171af9316cc2e1d2e7 Mon Sep 17 00:00:00 2001
From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 23 Mar 2009 18:47:03 +0000
Subject: [PATCH] STABLE14-viced-type-fixups-20090323

LICENSE IPL10

SetLogThreadNum takes a fcn returning int.
get_key's first arg is a void*


(cherry picked from commit 7a7b55658b7c72eef0f9b495f02ce766c9961d6e)
---
 src/viced/viced.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/viced/viced.c b/src/viced/viced.c
index ab3c5a3b6f..d4f83a14ea 100644
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -315,7 +315,7 @@ ResetCheckDescriptors(void)
 }
 
 #if defined(AFS_PTHREAD_ENV)
-char *
+int
 threadNum(void)
 {
     return pthread_getspecific(rx_thread_id_key);
@@ -324,7 +324,7 @@ threadNum(void)
 
 /* proc called by rxkad module to get a key */
 static int
-get_key(char *arock, register afs_int32 akvno, char *akey)
+get_key(void *arock, register afs_int32 akvno, char *akey)
 {
     /* find the key */
     static struct afsconf_key tkey;