diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-08-29 14:32:10 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-08-29 14:32:10 -0400 |
| commit | 8bf769c47af11b484295c9e7189f756aa106c64e (patch) | |
| tree | a2501a8507e31e9ff27f7c3a78a5c3fde550b64b | |
| parent | f691389e82699033a3973d1b2c298b0c820b3b64 (diff) | |
| parent | 6466e88ac1dac48eaa9435ce9a45d6496eed7abb (diff) | |
| download | libevent-8bf769c47af11b484295c9e7189f756aa106c64e.tar.gz | |
Merge remote-tracking branch 'origin/patches-2.0'
Conflicts:
sample/http-server.c
| -rw-r--r-- | sample/http-server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sample/http-server.c b/sample/http-server.c index e18c8562..cbb9c914 100644 --- a/sample/http-server.c +++ b/sample/http-server.c @@ -277,7 +277,7 @@ send_document_cb(struct evhttp_request *req, void *arg) #endif evbuffer_add_printf(evb, "</ul></body></html>\n"); #ifdef _WIN32 - CloseHandle(d); + FindClose(d); #else closedir(d); #endif |