diff options
| author | Nick Mathewson <nickm@torproject.org> | 2004-05-01 20:55:31 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2004-05-01 20:55:31 +0000 |
| commit | 6fa2ded74c632ea6f408ffbcac49f4e921d9b802 (patch) | |
| tree | 470ef1bdc6f7daf764784864f05e385c46dc5726 | |
| parent | 908ccb9dcdff19c6015a31726d2db5db5fef3ede (diff) | |
| download | tor-6fa2ded74c632ea6f408ffbcac49f4e921d9b802.tar.gz tor-6fa2ded74c632ea6f408ffbcac49f4e921d9b802.zip | |
Fix windows compile
svn:r1757
| -rw-r--r-- | src/or/buffers.c | 6 | ||||
| -rw-r--r-- | src/or/connection.c | 7 | ||||
| -rw-r--r-- | src/win32/orconfig.h | 2 |
3 files changed, 3 insertions, 12 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c index 931a83b0ff..280c1794e5 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -171,9 +171,6 @@ void buf_free(buf_t *buf) { int read_to_buf(int s, size_t at_most, buf_t *buf, int *reached_eof) { int read_result; -#ifdef MS_WINDOWS - int e; -#endif assert_buf_ok(buf); tor_assert(reached_eof && (s>=0)); @@ -244,9 +241,6 @@ int flush_buf(int s, buf_t *buf, int *buf_flushlen) * return -1 or how many bytes you just flushed */ int write_result; -#ifdef MS_WINDOWS - int e; -#endif assert_buf_ok(buf); tor_assert(buf_flushlen && (s>=0) && ((unsigned)*buf_flushlen <= buf->datalen)); diff --git a/src/or/connection.c b/src/or/connection.c index 690f442618..074bd8c820 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -279,13 +279,13 @@ int connection_create_listener(char *bindaddress, uint16_t bindport, int type) { if(bind(s,(struct sockaddr *)&bindaddr,sizeof(bindaddr)) < 0) { log_fn(LOG_WARN,"Could not bind to port %u: %s",bindport, - strerror(tor_socket_errno())); + strerror(tor_socket_errno(s))); return -1; } if(listen(s,SOMAXCONN) < 0) { log_fn(LOG_WARN,"Could not listen on port %u: %s",bindport, - strerror(tor_socket_errno())); + strerror(tor_socket_errno(s))); return -1; } @@ -313,9 +313,6 @@ static int connection_handle_listener_read(connection_t *conn, int new_type) { connection_t *newconn; struct sockaddr_in remote; /* information about the remote peer when connecting to other routers */ int remotelen = sizeof(struct sockaddr_in); /* length of the remote address */ -#ifdef MS_WINDOWS - int e; -#endif news = accept(conn->s,(struct sockaddr *)&remote,&remotelen); if (news == -1) { /* accept() error */ diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 09a84282fb..07d61a4306 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -190,4 +190,4 @@ ine to the address where bug reports for this package should be sent. */ #define UNALIGNED_INT_ACCESS_OK /* Version number of package */ -#define VERSION "0.0.6rc2" +#define VERSION "0.0.6rc3" |