Removed extra references to thread keys that are not extern

diff --git a/citadel/threads.h b/citadel/threads.h
index 5540d27a83568efd99076ab21c8cbcc7eaaa46e8..33b854ea9cbee84d8ce5dc67f28734ae7f754f1c 100644 (file)
--- a/citadel/threads.h
+++ b/citadel/threads.h
@@ -24,7 +24,7 @@ struct thread_tsd {
        DBC *cursors[MAXCDB];   /* Cursors, for traversals... */
 };
 
-pthread_key_t ThreadKey;
+extern pthread_key_t ThreadKey;
 extern struct thread_tsd masterTSD;
 #define TSD MyThread()
 

diff --git a/libcitadel/Makefile.in b/libcitadel/Makefile.in
index 5aa22235207b91ac5bdaf2a1167e62ac8913512a..e4f4ec476c7e38b96519965ce8becef5d8157188 100755 (executable)
--- a/libcitadel/Makefile.in
+++ b/libcitadel/Makefile.in
@@ -79,6 +79,7 @@ install: $(LIBRARY) $(APIHEADER) install-pkgconfigDATA
        $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
        $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY)
        for FN in $(APIHEADER) ; do $(INSTALL_DATA) $$FN $(DESTDIR)$(includedir) ; done
+       ldconfig || true
 
 uninstall:
        $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(LIBRARY)

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index f02a619913123c375a81c599d29b6e5dd17896cf..5a0730297d3b23255c04c99c8a35a0ce378f6a67 100644 (file)
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -24,7 +24,6 @@ pthread_mutex_t SessionListMutex;
 
 wcsession *SessionList = NULL; /* Linked list of all webcit sessions */
 
-pthread_key_t MyConKey;         /* TSD key for MySession() */
 HashList *HttpReqTypes = NULL;
 HashList *HttpHeaderHandler = NULL;
 extern HashList *HandlerHash;

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 24fd560211f6d2c7ee87c74ee568cf073a7d7e38..636c7a706fe074094783268b62870b1fdf5e4fa2 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -22,7 +22,6 @@ int follow_xff = 0;                           /* Follow X-Forwarded-For: header? */
 int DisableGzip = 0;
 char *default_landing_page = NULL;
 extern pthread_mutex_t SessionListMutex;
-extern pthread_key_t MyConKey;
 
 extern void *housekeeping_loop(void);
 extern int webcit_tcp_server(char *ip_addr, int port_number, int queue_len);