X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/b5bc2a8ccb7d7ca6d9685e1186b821b0d58e3330..37ee990eab0e60fadbc1555d3f4a7e85d2026297:/faim/faimconfig.h

diff --git a/faim/faimconfig.h b/faim/faimconfig.h
index c5d3d6b..f439f1e 100644
--- a/faim/faimconfig.h
+++ b/faim/faimconfig.h
@@ -20,25 +20,6 @@
 */
 #define debug 0
 
-/*
- * Maximum number of connections the library can simultaneously
- * handle per session structure.  Five is fairly arbitrary.  
- * 
- * Normally, only one connection gets used at a time.  However, if
- * chat is used, its easily possible for several connections to be
- * open simultaneously.
- *
- * Normal connection list looks like this:
- *   1 -- used for authentication at login (closed after login)
- *   1 -- used for BOS (general messaging) (stays open for entire session)
- *   1 -- used for chatnav (room creation, etc) (opened at random)
- *  1n -- used for n connected chat rooms (AOL limits to three)
- *
- * Default: 7
- *
- */
-#define AIM_CONN_MAX 7
-
 /*
  * USE_SNAC_FOR_IMS is an old feature that allowed better
  * tracking of error messages by caching SNAC IDs of outgoing
@@ -81,19 +62,29 @@
 #define AIMUTIL_USEMACROS
 
 /*
- * Select whether or not to use POSIX thread functionality.
+ * What type of synchronisation to use.
  * 
- * We don't actually use threads, but we do use the POSIX mutex
+ * We don't actually use threads, but can use the POSIX mutex
  * in order to maintain thread safety.  You can use the fake locking
- * if you really don't like pthreads or you don't have it.
+ * if you really don't like pthreads (which I don't) or if you don't
+ * have it.
+ *
+ *   USEPTHREADS - Use POSIX mutecies
+ *   USEFAKELOCKS - Use little stub spinners to help find locking bugs
+ *   USENOPLOCKS - No-op out all synchro calls at compile time
+ * 
+ * Default: use noplocks by default.
+ *
+ * !!!NOTE: Even with USEPTHREADS turned on, libfaim is not fully thread
+ *          safe.  It will still take some effort to add locking calls to
+ *          the places that need them.  In fact, this feature in general
+ *          is in danger of being officially deprecated and removed from 
+ *          the code.
  *
- * Default: defined on Linux, otherwise use fake locks.
  */
-#ifdef __linux__
-#define FAIM_USEPTHREADS
-#else
-#define FAIM_USEFAKELOCKS
-#endif
+#undef FAIM_USEPTHREADS
+#undef FAIM_USEFAKELOCKS
+#define FAIM_USENOPLOCKS
 
 /*
  * Size of the SNAC caching hash.
@@ -103,6 +94,13 @@
  */
 #define FAIM_SNAC_HASH_SIZE 16
 
+/*
+ * If building on Win32,define WIN32_STATIC if you don't want
+ * to compile libfaim as a DLL (and instead link it right into
+ * your app).
+ */
+#define WIN32_STATIC
+
 #endif /* __FAIMCONFIG_H__ */