From 8ee42e8dba0ae70c5bd7a8db20061b9c731fba8c Mon Sep 17 00:00:00 2001
From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 30 May 2005 19:30:36 +0000
Subject: [PATCH] STABLE14-rxkad-stats-cleanup-20050530

minor reorg so everything links ok


(cherry picked from commit c87ae4f82cacacef68a2b54ad21e17ac6d5ddfae)
---
 src/des/key_sched.c      | 4 ++++
 src/des/stats.h          | 2 +-
 src/rxkad/Makefile.in    | 1 +
 src/rxkad/rxkad_common.c | 3 ++-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/des/key_sched.c b/src/des/key_sched.c
index 93eefb03b..4076b8b77 100644
--- a/src/des/key_sched.c
+++ b/src/des/key_sched.c
@@ -44,6 +44,10 @@ RCSID
 
 typedef char key[64];
 
+#ifndef AFS_PTHREAD_ENV 
+struct rxkad_stats rxkad_stats = { { 0 } }; 
+#endif
+
 /* the following are really void but cc86 doesnt allow it */
 static int make_key_sched();
 
diff --git a/src/des/stats.h b/src/des/stats.h
index bf38e4086..78dfc77ba 100644
--- a/src/des/stats.h
+++ b/src/des/stats.h
@@ -52,7 +52,7 @@ struct rxkad_stats {
     struct rxkad_stats_t * prev;
 } rxkad_stats_t;			/* put these here for convenience */
 #else /* AFS_PTHREAD_ENV */
-} rxkad_stats;			/* put these here for convenience */
+};
 #endif /* AFS_PTHREAD_ENV */
 
 
diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in
index e830edfa4..c05c0cdf6 100644
--- a/src/rxkad/Makefile.in
+++ b/src/rxkad/Makefile.in
@@ -23,6 +23,7 @@ fc_test_OBJS=fc_test.o
 
 fc_test_LIBS=\
 	${TOP_LIBDIR}/librxkad.a \
+	${TOP_LIBDIR}/libdes.a \
 	${TOP_LIBDIR}/librx.a \
 	${TOP_LIBDIR}/liblwp.a \
 	${TOP_LIBDIR}/libsys.a \
diff --git a/src/rxkad/rxkad_common.c b/src/rxkad/rxkad_common.c
index 3f1727d58..bc263f7e5 100644
--- a/src/rxkad/rxkad_common.c
+++ b/src/rxkad/rxkad_common.c
@@ -89,7 +89,8 @@ struct rxkad_global_stats rxkad_global_stats = { 0 };
 pthread_mutex_t rxkad_global_stats_lock;
 pthread_key_t rxkad_stats_key;
 #else /* AFS_PTHREAD_ENV */
-struct rxkad_stats rxkad_stats = { { 0 } };
+/* Move delaration of this to des/key_sched.c */
+/* struct rxkad_stats rxkad_stats = { { 0 } }; */
 #endif /* AFS_PTHREAD_ENV */
 
 #ifdef AFS_PTHREAD_ENV
-- 
2.39.5