#ifdef out some Win32-incompatible code blocks

3 files changed, 8 insertions, 4 deletions

diff --git a/bitlbee.c b/bitlbee.c
index cca14916..30167fea 100644
--- a/bitlbee.c
+++ b/bitlbee.c
@@ -122,6 +122,7 @@ int bitlbee_daemon_init()
 		global.conf->runmode == RUNMODE_FORKDAEMON )
 		ipc_master_listen_socket();
 	
+#ifndef _WIN32
 	if( ( fp = fopen( global.conf->pidfile, "w" ) ) )
 	{
 		fprintf( fp, "%d\n", (int) getpid() );
@@ -131,6 +132,7 @@ int bitlbee_daemon_init()
 	{
 		log_message( LOGLVL_WARNING, "Warning: Couldn't write PID to `%s'", global.conf->pidfile );
 	}
+#endif
 	
 	return( 0 );
 }
@@ -252,7 +254,6 @@ gboolean bitlbee_io_new_client( GIOChannel *source, GIOCondition condition, gpoi
 	size_t size = sizeof( struct sockaddr_in );
 	struct sockaddr_in conn_info;
 	int new_socket = accept( global.listen_socket, (struct sockaddr *) &conn_info, &size );
-	pid_t client_pid = 0;
 	
 	if( new_socket == -1 )
 	{
@@ -260,8 +261,10 @@ gboolean bitlbee_io_new_client( GIOChannel *source, GIOCondition condition, gpoi
 		return TRUE;
 	}
 	
+#ifndef _WIN32
 	if( global.conf->runmode == RUNMODE_FORKDAEMON )
 	{
+		pid_t client_pid = 0;
 		int fds[2];
 		
 		if( socketpair( AF_UNIX, SOCK_STREAM, 0, fds ) == -1 )
@@ -312,6 +315,7 @@ gboolean bitlbee_io_new_client( GIOChannel *source, GIOCondition condition, gpoi
 		}
 	}
 	else
+#endif
 	{
 		log_message( LOGLVL_INFO, "Creating new connection with fd %d.", new_socket );
 		irc_new( new_socket );
diff --git a/ipc.c b/ipc.c
index 18d3284e..a9f3ea34 100644
--- a/ipc.c
+++ b/ipc.c
@@ -416,6 +416,7 @@ void ipc_master_free_all()
 	child_list = NULL;
 }
 
+#ifndef _WIN32
 char *ipc_master_save_state()
 {
 	char *fn = g_strdup( "/tmp/bee-restart.XXXXXX" );
@@ -483,7 +484,6 @@ static gboolean new_ipc_client (GIOChannel *gio, GIOCondition cond, gpointer dat
 	return TRUE;
 }
 
-#ifndef _WIN32
 int ipc_master_listen_socket()
 {
 	struct sockaddr_un un_addr;
diff --git a/protocols/ssl_sspi.c b/protocols/ssl_sspi.c
index 2129f07b..0529b4ec 100644
--- a/protocols/ssl_sspi.c
+++ b/protocols/ssl_sspi.c
@@ -38,7 +38,7 @@ int ssl_errno;
 struct scd
 {
 	int fd;
-	SslInputFunction func;
+	ssl_input_function func;
 	gpointer data;
 	gboolean established;
 	int inpa;
@@ -59,7 +59,7 @@ void sspi_global_deinit( void )
 	/* FIXME */
 }
 
-void *ssl_connect( char *host, int port, SslInputFunction func, gpointer data )
+void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
 {
 	struct scd *conn = g_new0( struct scd, 1 );
 	SCHANNEL_CRED ssl_cred;