Get rid of the #ifdef ENABLE_THREADS since we no longer plan to

2003-07-09  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-block-file.c: Get rid of the #ifdef ENABLE_THREADS since
	we no longer plan to support/maintain this.

	* camel.c: Same.

	* camel-certdb.c: Here too.

	* camel-charset-map.c: And here.

	* camel-cipher-context.c: "

	* camel-data-wrapper.c: "

	* camel-digest-folder.c: "

	* camel-exception.c: "

	* camel-folder.c: "

	* camel-folder-summary.c: "

	* camel-lock-client.c: "

	* camel-mime-utils.c: "

	* camel-object.c: "

	* camel-operation.c: "

	* camel-partition-table.c: "

	* camel-sasl-popb4smtp.c: "

	* camel-service.c: "

	* camel-session.c: "

	* camel-store.c: "

	* camel-store-summary.c: "

	* camel-text-index.c: "

	* camel-transport.c: "

	* camel-vee-folder.c: "

	* camel-tcp-stream-openssl.c: Removed pthread.h, it isn't needed.

svn path=/trunk/; revision=21777

1 files changed, 11 insertions, 88 deletions

diff --git a/camel/camel-private.h b/camel/camel-private.h
index 6de65b54eb..c9ce24fd01 100644
--- a/camel/camel-private.h
+++ b/camel/camel-private.h
@@ -31,102 +31,62 @@ extern "C" {
 /* need a way to configure and save this data, if this header is to
    be installed.  For now, dont install it */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
-#ifdef ENABLE_THREADS
 #include <pthread.h>
 #include <e-util/e-msgport.h>
-#endif
 
 struct _CamelFolderPrivate {
-#ifdef ENABLE_THREADS
 	EMutex *lock;
 	EMutex *change_lock;
-#endif
 	/* must require the 'change_lock' to access this */
 	int frozen;
 	struct _CamelFolderChangeInfo *changed_frozen; /* queues changed events */
 };
 
-#ifdef ENABLE_THREADS
 #define CAMEL_FOLDER_LOCK(f, l) (e_mutex_lock(((CamelFolder *)f)->priv->l))
 #define CAMEL_FOLDER_UNLOCK(f, l) (e_mutex_unlock(((CamelFolder *)f)->priv->l))
-#else
-#define CAMEL_FOLDER_LOCK(f, l)
-#define CAMEL_FOLDER_UNLOCK(f, l)
-#endif
+
 
 struct _CamelStorePrivate {
-#ifdef ENABLE_THREADS
 	EMutex *folder_lock;	/* for locking folder operations */
-#else
-	int dummy;
-#endif
 };
 
-#ifdef ENABLE_THREADS
 #define CAMEL_STORE_LOCK(f, l) (e_mutex_lock(((CamelStore *)f)->priv->l))
 #define CAMEL_STORE_UNLOCK(f, l) (e_mutex_unlock(((CamelStore *)f)->priv->l))
-#else
-#define CAMEL_STORE_LOCK(f, l)
-#define CAMEL_STORE_UNLOCK(f, l)
-#endif
+
 
 struct _CamelTransportPrivate {
-#ifdef ENABLE_THREADS
 	GMutex *send_lock;   /* for locking send operations */
-#else
-	int dummy;
-#endif
 };
 
-#ifdef ENABLE_THREADS
 #define CAMEL_TRANSPORT_LOCK(f, l) (g_mutex_lock(((CamelTransport *)f)->priv->l))
 #define CAMEL_TRANSPORT_UNLOCK(f, l) (g_mutex_unlock(((CamelTransport *)f)->priv->l))
-#else
-#define CAMEL_TRANSPORT_LOCK(f, l)
-#define CAMEL_TRANSPORT_UNLOCK(f, l)
-#endif
+
 
 struct _CamelServicePrivate {
-#ifdef ENABLE_THREADS
 	EMutex *connect_lock;	/* for locking connection operations */
 	EMutex *connect_op_lock;/* for locking the connection_op */
-#else
-	int dummy;
-#endif
 };
 
-#ifdef ENABLE_THREADS
 #define CAMEL_SERVICE_LOCK(f, l) (e_mutex_lock(((CamelService *)f)->priv->l))
 #define CAMEL_SERVICE_UNLOCK(f, l) (e_mutex_unlock(((CamelService *)f)->priv->l))
 #define CAMEL_SERVICE_ASSERT_LOCKED(f, l) (e_mutex_assert_locked (((CamelService *)f)->priv->l))
-#else
-#define CAMEL_SERVICE_LOCK(f, l)
-#define CAMEL_SERVICE_UNLOCK(f, l)
-#define CAMEL_SERVICE_ASSERT_LOCKED(f, l)
-#endif
+
 
 struct _CamelSessionPrivate {
-#ifdef ENABLE_THREADS
 	GMutex *lock;		/* for locking everything basically */
 	GMutex *thread_lock;	/* locking threads */
 
 	int thread_id;
 	GHashTable *thread_active;
 	EThread *thread_queue;
-#else
-	int dummy;
-#endif
 };
 
-#ifdef ENABLE_THREADS
 #define CAMEL_SESSION_LOCK(f, l) (g_mutex_lock(((CamelSession *)f)->priv->l))
 #define CAMEL_SESSION_UNLOCK(f, l) (g_mutex_unlock(((CamelSession *)f)->priv->l))
-#else
-#define CAMEL_SESSION_LOCK(f, l)
-#define CAMEL_SESSION_UNLOCK(f, l)
-#endif
 
 
 /* most of this stuff really is private, but the lock can be used by subordinate classes */
@@ -143,98 +103,61 @@ struct _CamelFolderSummaryPrivate {
 	struct _CamelStreamFilter *filter_stream;
 
 	struct _CamelIndex *index;
-
-#ifdef ENABLE_THREADS
+	
 	GMutex *summary_lock;	/* for the summary hashtable/array */
 	GMutex *io_lock;	/* load/save lock, for access to saved_count, etc */
 	GMutex *filter_lock;	/* for accessing any of the filtering/indexing stuff, since we share them */
 	GMutex *alloc_lock;	/* for setting up and using allocators */
 	GMutex *ref_lock;	/* for reffing/unreffing messageinfo's ALWAYS obtain before summary_lock */
-#endif
 };
 
-#ifdef ENABLE_THREADS
 #define CAMEL_SUMMARY_LOCK(f, l) (g_mutex_lock(((CamelFolderSummary *)f)->priv->l))
 #define CAMEL_SUMMARY_UNLOCK(f, l) (g_mutex_unlock(((CamelFolderSummary *)f)->priv->l))
-#else
-#define CAMEL_SUMMARY_LOCK(f, l)
-#define CAMEL_SUMMARY_UNLOCK(f, l)
-#endif
+
 
 struct _CamelStoreSummaryPrivate {
-#ifdef ENABLE_THREADS
 	GMutex *summary_lock;	/* for the summary hashtable/array */
 	GMutex *io_lock;	/* load/save lock, for access to saved_count, etc */
 	GMutex *alloc_lock;	/* for setting up and using allocators */
 	GMutex *ref_lock;	/* for reffing/unreffing messageinfo's ALWAYS obtain before summary_lock */
-#else
-	int dummy;
-#endif
 };
 
-#ifdef ENABLE_THREADS
 #define CAMEL_STORE_SUMMARY_LOCK(f, l) (g_mutex_lock(((CamelStoreSummary *)f)->priv->l))
 #define CAMEL_STORE_SUMMARY_UNLOCK(f, l) (g_mutex_unlock(((CamelStoreSummary *)f)->priv->l))
-#else
-#define CAMEL_STORE_SUMMARY_LOCK(f, l)
-#define CAMEL_STORE_SUMMARY_UNLOCK(f, l)
-#endif
+
 
 struct _CamelVeeFolderPrivate {
 	GList *folders;			/* lock using subfolder_lock before changing/accessing */
 	GList *folders_changed;		/* for list of folders that have changed between updates */
 	int freeze_count;
 	
-#ifdef ENABLE_THREADS
 	GMutex *summary_lock;		/* for locking vfolder summary */
 	GMutex *subfolder_lock;		/* for locking the subfolder list */
 	GMutex *changed_lock;		/* for locking the folders-changed list */
-#endif
 };
 
-#ifdef ENABLE_THREADS
 #define CAMEL_VEE_FOLDER_LOCK(f, l) (g_mutex_lock(((CamelVeeFolder *)f)->priv->l))
 #define CAMEL_VEE_FOLDER_UNLOCK(f, l) (g_mutex_unlock(((CamelVeeFolder *)f)->priv->l))
-#else
-#define CAMEL_VEE_FOLDER_LOCK(f, l)
-#define CAMEL_VEE_FOLDER_UNLOCK(f, l)
-#endif
+
 
 struct _CamelDataWrapperPrivate {
-#ifdef ENABLE_THREADS
 	pthread_mutex_t stream_lock;
-#else
-	int dummy;
-#endif
 };
 
-#ifdef ENABLE_THREADS
 #define CAMEL_DATA_WRAPPER_LOCK(dw, l)   (pthread_mutex_lock(&((CamelDataWrapper *)dw)->priv->l))
 #define CAMEL_DATA_WRAPPER_UNLOCK(dw, l) (pthread_mutex_unlock(&((CamelDataWrapper *)dw)->priv->l))
-#else
-#define CAMEL_DATA_WRAPPER_LOCK(dw, l)
-#define CAMEL_DATA_WRAPPER_UNLOCK(dw, l)
-#endif
+
 
 /* most of this stuff really is private, but the lock can be used by subordinate classes */
 struct _CamelCertDBPrivate {
-#ifdef ENABLE_THREADS
 	GMutex *db_lock;	/* for the db hashtable/array */
 	GMutex *io_lock;	/* load/save lock, for access to saved_count, etc */
 	GMutex *alloc_lock;	/* for setting up and using allocators */
 	GMutex *ref_lock;	/* for reffing/unreffing certs */
-#else
-	int dummy;
-#endif
 };
 
-#ifdef ENABLE_THREADS
 #define CAMEL_CERTDB_LOCK(db, l) (g_mutex_lock (((CamelCertDB *) db)->priv->l))
 #define CAMEL_CERTDB_UNLOCK(db, l) (g_mutex_unlock (((CamelCertDB *) db)->priv->l))
-#else
-#define CAMEL_CERTDB_LOCK(db, l)
-#define CAMEL_CERTDB_UNLOCK(db, l)
-#endif
 
 #ifdef __cplusplus
 }