Changeset 80c1e4d

Timestamp:

2006-05-24T23:31:20Z (19 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

51a4ffb

Parents:

601e813

Message:

#ifdef out some Win32-incompatible code blocks

Files:

• bitlbee.c (modified) (5 diffs)
• ipc.c (modified) (2 diffs)
• protocols/ssl_sspi.c (modified) (2 diffs)

bitlbee.c

@@ -123 +123 @@
                 ipc_master_listen_socket();
         
+#ifndef _WIN32
         if( ( fp = fopen( global.conf->pidfile, "w" ) ) )
         {
@@ -132 +133 @@
                 log_message( LOGLVL_WARNING, "Warning: Couldn't write PID to `%s'", global.conf->pidfile );
         }
+#endif
         
         return( 0 );
@@ -253 +255 @@
         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 )
@@ -261 +262 @@
         }
         
+#ifndef _WIN32
         if( global.conf->runmode == RUNMODE_FORKDAEMON )
         {
+                pid_t client_pid = 0;
                 int fds[2];
                 
@@ -313 +316 @@
         }
         else
+#endif
         {
                 log_message( LOGLVL_INFO, "Creating new connection with fd %d.", new_socket );

ipc.c

@@ -417 +417 @@
 }
 
+#ifndef _WIN32
 char *ipc_master_save_state()
 {
@@ -484 +485 @@
 }
 
-#ifndef _WIN32
 int ipc_master_listen_socket()
 {

protocols/ssl_sspi.c

@@ -39 +39 @@
 {
         int fd;
-        SslInputFunction func;
+        ssl_input_function func;
         gpointer data;
         gboolean established;
@@ -60 +60 @@
 }
 
-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 );