diff -Naur honeyd-1.5c.orig/tagging.c honeyd-1.5c/tagging.c
--- honeyd-1.5c.orig/tagging.c	2007-05-28 02:12:52.000000000 -0400
+++ honeyd-1.5c/tagging.c	2011-01-11 20:56:53.000000000 -0500
@@ -73,7 +73,7 @@
  */
 
 void
-encode_int(struct evbuffer *evbuf, uint32_t number)
+encode__int(struct evbuffer *evbuf, uint32_t number)
 {
 	int off = 1, nibbles = 0;
 	uint8_t data[5];
@@ -108,7 +108,7 @@
 tag_marshal(struct evbuffer *evbuf, uint8_t tag, void *data, uint16_t len)
 {
 	evbuffer_add(evbuf, &tag, sizeof(tag));
-	encode_int(evbuf, len);
+	encode__int(evbuf, len);
 	evbuffer_add(evbuf, data, len);
 }
 
@@ -117,10 +117,10 @@
 tag_marshal_int(struct evbuffer *evbuf, uint8_t tag, uint32_t integer)
 {
 	evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));
-	encode_int(_buf, integer);
+	encode__int(_buf, integer);
 
 	evbuffer_add(evbuf, &tag, sizeof(tag));
-	encode_int(evbuf, EVBUFFER_LENGTH(_buf));
+	encode__int(evbuf, EVBUFFER_LENGTH(_buf));
 	evbuffer_add_buffer(evbuf, _buf);
 }
 
@@ -135,8 +135,8 @@
 {
 	evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));
 
-	encode_int(_buf, tv->tv_sec);
-	encode_int(_buf, tv->tv_usec);
+	encode__int(_buf, tv->tv_sec);
+	encode__int(_buf, tv->tv_usec);
 
 	tag_marshal(evbuf, tag, EVBUFFER_DATA(_buf),
 	    EVBUFFER_LENGTH(_buf));
diff -Naur honeyd-1.5c.orig/tagging.h honeyd-1.5c/tagging.h
--- honeyd-1.5c.orig/tagging.h	2011-01-11 20:49:11.000000000 -0500
+++ honeyd-1.5c/tagging.h	2011-01-11 20:56:29.000000000 -0500
@@ -86,7 +86,9 @@
 void tag_marshal(struct evbuffer *evbuf, uint8_t tag, void *data,
      uint16_t len);
 
-void encode_int(struct evbuffer *evbuf, uint32_t number);
+// Rename encode_int to encode__int to avoid collision with
+// macro in libevent-2 event2/tag_compat.h 
+void encode__int(struct evbuffer *evbuf, uint32_t number);
 
 void tag_marshal_int(struct evbuffer *evbuf, uint8_t tag, uint32_t integer);
 
diff -Naur honeyd-1.5c.orig/untagging.c honeyd-1.5c/untagging.c
--- honeyd-1.5c.orig/untagging.c	2007-05-28 02:12:52.000000000 -0400
+++ honeyd-1.5c/untagging.c	2011-01-11 20:57:05.000000000 -0500
@@ -438,7 +438,7 @@
 	for (i = 0; i < TEST_MAX_INT; i++) {
 		int oldlen, newlen;
 		oldlen = EVBUFFER_LENGTH(tmp);
-		encode_int(tmp, integers[i]);
+		encode__int(tmp, integers[i]);
 		newlen = EVBUFFER_LENGTH(tmp);
 		fprintf(stderr, "\t\tencoded 0x%08x with %d bytes\n",
 		    integers[i], newlen - oldlen);