From da45aa74a7823eae2ec2899b7bc347e915e422f5 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 2 Dec 2011 01:48:14 -0500
Subject: [PATCH] fix windows compilation issues with new file segment code

Found by Linus Nordberg
---
 buffer.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/buffer.c b/buffer.c
index 8c246c52..9b4edda5 100644
--- a/buffer.c
+++ b/buffer.c
@@ -2769,7 +2769,9 @@ evbuffer_file_segment_new(
 	if (evbuffer_file_segment_materialize(seg)<0)
 		goto err;
 
+#if defined(USE_SENDFILE)
 done:
+#endif
 	if (!(flags & EVBUF_FS_DISABLE_LOCKING)) {
 		EVTHREAD_ALLOC_LOCK(seg->lock, 0);
 	}
@@ -2839,7 +2841,7 @@ evbuffer_file_segment_materialize(struct evbuffer_file_segment *seg)
 		HANDLE m;
 		ev_uint64_t total_size = length+offset;
 		if (h == (long)INVALID_HANDLE_VALUE)
-			return NULL;
+			goto err;
 		m = CreateFileMapping((HANDLE)h, NULL, PAGE_READONLY,
 		    (total_size >> 32), total_size & 0xfffffffful,
 		    NULL);