Changeset f5d1b31 for unix.c

Timestamp:

2008-06-29T23:41:39Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

dfd442b

Parents:

cd63d58 (diff), 913545e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging changes from Jelmer: It's now possible to cross-compile a Windows
version of BitlBee from Linux. No working SSL support yet though!

File:

• unix.c (modified) (3 diffs)

unix.c

@@ -60 +60 @@
         if( global.conf->runmode == RUNMODE_INETD )
         {
+                log_link( LOGLVL_ERROR, LOGOUTPUT_IRC );
+                log_link( LOGLVL_WARNING, LOGOUTPUT_IRC );
+        
                 i = bitlbee_inetd_init();
                 log_message( LOGLVL_INFO, "Bitlbee %s starting in inetd mode.", BITLBEE_VERSION );
@@ -66 +69 @@
         else if( global.conf->runmode == RUNMODE_DAEMON )
         {
+                log_link( LOGLVL_ERROR, LOGOUTPUT_SYSLOG );
+                log_link( LOGLVL_WARNING, LOGOUTPUT_SYSLOG );
+
                 i = bitlbee_daemon_init();
                 log_message( LOGLVL_INFO, "Bitlbee %s starting in daemon mode.", BITLBEE_VERSION );
@@ -208 +214 @@
         return( (double) time->tv_sec + (double) time->tv_usec / 1000000 );
 }
+
+