STABLE14-rxkad-stats-cleanup-20050530

minor reorg so everything links ok

(cherry picked from commit c87ae4f82cacacef68a2b54ad21e17ac6d5ddfae)

diff --git a/src/des/key_sched.c b/src/des/key_sched.c
index 93eefb03bb35d799870b1a9ec57d76d3a561cd0a..4076b8b775d7ea1e356d8cc0667671b777c3de9a 100644 (file)
--- 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 bf38e408696ed9974168dd5380d8ba04c2cfa9bd..78dfc77badd23ce3c10471ea73ddcb5a183bb138 100644 (file)
--- 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 e830edfa40fe68197dfdc665ec4a76412e463869..c05c0cdf6eb2c46189fec99a0cf92af1e4bcd9e1 100644 (file)
--- 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 3f1727d58e9b30bf52f9dba7d8bc7f9450f30168..bc263f7e579b0dac003320180fc2964371eeb45d 100644 (file)
--- 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