Commit 2da54de9 authored by Nick Mathewson's avatar Nick Mathewson 🐘
Browse files

Make tor build on windows again. More work still needed 


svn:r1247
parent 30969421

Win32Build/or/or.dsp

+20 −8
Changes for Win32Build/or/or.dsp: 20 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ BSC32=bscmake.exe 
# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib libeay32.lib ssleay32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"d:\openssl\lib\vc"

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib libeay32.lib ssleay32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/tor.exe" /pdbtype:sept /libpath:"d:\openssl\lib\vc"



!ENDIF
@@ -111,19 +111,15 @@ SOURCE=..\..\src\or\connection.c 
# End Source File

# Begin Source File



SOURCE=..\..\src\or\connection_ap.c

# End Source File

# Begin Source File



SOURCE=..\..\src\or\connection_edge.c

# End Source File

# Begin Source File



SOURCE=..\..\src\or\connection_exit.c

SOURCE=..\..\src\or\connection_or.c

# End Source File

# Begin Source File



SOURCE=..\..\src\or\connection_or.c

SOURCE=..\..\src\or\cpuworker.c

# End Source File

# Begin Source File
@@ -135,6 +131,10 @@ SOURCE=..\..\src\or\directory.c 
# End Source File

# Begin Source File



SOURCE=..\..\src\or\dirserv.c

# End Source File

# Begin Source File



SOURCE=..\..\src\or\dns.c

# End Source File

# Begin Source File
@@ -155,7 +155,11 @@ SOURCE=..\..\src\or\onion.c 
# End Source File

# Begin Source File



SOURCE=..\..\src\or\routers.c

SOURCE=..\..\src\or\router.c

# End Source File

# Begin Source File



SOURCE=..\..\src\or\routerlist.c

# End Source File

# Begin Source File
@@ -163,6 +167,10 @@ SOURCE=..\..\src\or\tor_main.c 
# End Source File

# Begin Source File



SOURCE=..\..\src\common\tortls.c

# End Source File

# Begin Source File



SOURCE=..\..\src\common\util.c

# End Source File

# End Group
@@ -203,6 +211,10 @@ SOURCE=..\..\src\common\torint.h 
# End Source File

# Begin Source File



SOURCE=..\..\src\common\tortls.h

# End Source File

# Begin Source File



SOURCE=..\..\src\or\tree.h

# End Source File

# Begin Source File

Win32Build/tor/tor.ncb

+88 KiB (193 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

Win32Build/tor/tor.opt

+3 KiB (57.5 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

src/common/fakepoll.c

+1 −1
Changes for src/common/fakepoll.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
int

tor_poll(struct pollfd *ufds, unsigned int nfds, int timeout)

{

        int idx, maxfd, fd;

        unsigned int idx, maxfd, fd;

        int r;

#ifdef MS_WINDOWS

        int any_fds_set = 0;

src/common/log.c

+4 −1
Changes for src/common/log.c: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ 
/* $Id$ */



#include "../or/or.h"

#ifdef MS_WINDOWS

#define vsnprintf _vsnprintf

#endif



struct logfile_t;

typedef struct logfile_t {
@@ -35,7 +38,7 @@ static INLINE void format_msg(char *buf, size_t buf_len, 
{

  time_t t;

  struct timeval now;

  int n;

  size_t n;



  buf_len -= 2; /* subtract 2 characters so we have room for \n\0 */