one more batch of changes from Spry

daemon/daemon.c

@@ -377,6 +377,7 @@ gotsig( int sig UNUSED )
     closing = TRUE;
 }
 
+#if !defined( WIN32 )
 #if !defined( HAVE_DAEMON )
 static int
 daemon( int nochdir,
@@ -450,7 +451,7 @@ daemon( int nochdir,
 
     return 0;
 }
-
+#endif
 #endif
 
 int
@@ -484,6 +485,7 @@ main( int     argc,
                                               tr_getDefaultConfigDir( ) );
     myConfigFilename = tr_buildPath( configDir, CONFIG_FILE, NULL );
 
+#ifndef WIN32
     if( !nofork )
     {
         if( 0 > daemon( 1, 0 ) )
@@ -492,6 +494,7 @@ main( int     argc,
             exit( 1 );
         }
     }
+#endif
 
     session_init( configDir, downloadDir,
                   rpcPort, whitelist, authRequired, username, password,

libtransmission/inout.c

@@ -36,7 +36,13 @@
 
 #ifdef WIN32
  #define lseek _lseeki64
+ #ifdef read
+   #undef read
+ #endif
  #define read  _read
+ #ifdef write
+   #undef write
+ #endif
  #define write _write
 #endif
 

libtransmission/utils.c

@@ -209,7 +209,7 @@ tr_deepLog( const char * file,
         va_end( args );
         evbuffer_add_printf( buf, " (%s:%d)\n", base, line );
 #ifdef WIN32
-        OutputDebugString( EVBUFFER_DATA( buf );
+        OutputDebugString( EVBUFFER_DATA( buf ) );
         if(fp)
 #endif
         (void) fwrite( EVBUFFER_DATA( buf ), 1, EVBUFFER_LENGTH( buf ), fp );

libtransmission/verify.c

@@ -10,6 +10,7 @@
  * $Id$
  */
 
+#include <unistd.h> /* S_ISREG */
 #include <sys/stat.h>
 
 #include "transmission.h"