fix double-free when there are multiple mxes

[citadel.git] / citadel / context.h

diff --git a/citadel/context.h b/citadel/context.h
index 4b450a416720bbc9cd0c9eb415a12415b50f5516..76d2a91911a4d6e70b498ba68b6a8c6c78787884 100644 (file)
--- a/citadel/context.h
+++ b/citadel/context.h
@@ -28,10 +28,12 @@ typedef enum __CCState {
        CON_SYS                 /* This is a system context and mustn't be purged */
 } CCState;
 
-#ifndef __ASYNCIO__
-#define __ASYNCIO__
-typedef struct AsyncIO AsyncIO; /* forward declaration for event_client.h */
-#endif
+//#ifndef __ASYNCIO__
+//#define __ASYNCIO__
+//typedef struct AsyncIO AsyncIO; /* forward declaration for event_client.h */
+//#endif
+
+
 #ifndef __CIT_CONTEXT__
 #define __CIT_CONTEXT__
 typedef struct CitContext CitContext;
@@ -151,14 +153,11 @@ struct CitContext {
 
        char vcard_updated_by_ldap;             /* !0 iff ldap changed the vcard, treat as aide update */
 
-       AsyncIO *IO;                            /* if this session has AsyncIO going on... */
+       //AsyncIO *IO;                          /* if this session has AsyncIO going on... */
 };
 
-
-
 #define CC MyContext()
 
-
 extern pthread_key_t MyConKey;                 /* TSD key for MyContext() */
 extern int num_sessions;
 extern CitContext masterCC;
@@ -207,18 +206,5 @@ static INLINE void become_session(CitContext *which_con) {
 
 
 
-/* typedef void (*CtdlDbgFunction) (const int); */
-
-extern int DebugSession;
-#define CONDBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (DebugSession != 0))
-
-#define CON_syslog(LEVEL, FORMAT, ...)                         \
-       CONDBGLOG(LEVEL) syslog(LEVEL,                          \
-                               "Context: " FORMAT, __VA_ARGS__)
-
-#define CONM_syslog(LEVEL, FORMAT)                     \
-       CONDBGLOG(LEVEL) syslog(LEVEL,                  \
-                               "Context: " FORMAT);
-
 
 #endif /* CONTEXT_H */