[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r8740: Oops. Libevent 1.2 exists. Add it to our enum, even though w (in tor/trunk: . src/or)
- To: or-cvs@xxxxxxxxxxxxx
- Subject: [or-cvs] r8740: Oops. Libevent 1.2 exists. Add it to our enum, even though w (in tor/trunk: . src/or)
- From: nickm@xxxxxxxx
- Date: Tue, 17 Oct 2006 11:20:16 -0400 (EDT)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Tue, 17 Oct 2006 11:20:25 -0400
- Reply-to: or-talk@xxxxxxxxxxxxx
- Sender: owner-or-cvs@xxxxxxxxxxxxx
Author: nickm
Date: 2006-10-17 11:20:15 -0400 (Tue, 17 Oct 2006)
New Revision: 8740
Modified:
tor/trunk/
tor/trunk/src/or/config.c
Log:
r9061@totoro: nickm | 2006-10-17 11:18:28 -0400
Oops. Libevent 1.2 exists. Add it to our enum, even though we dont care yet.
Property changes on: tor/trunk
___________________________________________________________________
svk:merge ticket from /tor/trunk [r9061] on 96637b51-b116-0410-a10e-9941ebb49b64
Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c 2006-10-17 15:20:00 UTC (rev 8739)
+++ tor/trunk/src/or/config.c 2006-10-17 15:20:15 UTC (rev 8740)
@@ -400,8 +400,11 @@
static void print_svn_version(void);
static void init_libevent(void);
static int opt_streq(const char *s1, const char *s2);
+/** Versions of libevent. */
typedef enum {
- LE_OLD=0, LE_10C, LE_10D, LE_10E, LE_11, LE_11A, LE_11B, LE_OTHER
+ /* Note: we compare these, so it's important that "old" precede everything,
+ * and that "other" come last. */
+ LE_OLD=0, LE_10C, LE_10D, LE_10E, LE_11, LE_11A, LE_11B, LE_12, LE_OTHER
} le_version_t;
static le_version_t decode_libevent_version(void);
#if defined(HAVE_EVENT_GET_VERSION) && defined(HAVE_EVENT_GET_METHOD)