Merge from Wilmer

1 files changed, 5 insertions, 3 deletions

diff --git a/bitlbee.h b/bitlbee.h
index 41247270..e459f07d 100644
--- a/bitlbee.h
+++ b/bitlbee.h
@@ -111,8 +111,10 @@ extern char *CONF_FILE;
 #include "query.h"
 #include "sock.h"
 
-typedef struct global_t {
+typedef struct global {
+	/* In forked mode, child processes store the fd of the IPC socket here. */
 	int listen_socket;
+	gint listen_watch_source_id;
 	help_t *help;
 	conf_t *conf;
 	GList *storage; /* The first backend in the list will be used for saving */
@@ -126,8 +128,8 @@ int bitlbee_inetd_init( void );
 gboolean bitlbee_io_current_client_read( GIOChannel *source, GIOCondition condition, gpointer data );
 gboolean bitlbee_io_current_client_write( GIOChannel *source, GIOCondition condition, gpointer data );
 
-int root_command_string( irc_t *irc, user_t *u, char *command, int flags );
-int root_command( irc_t *irc, char *command[] );
+void root_command_string( irc_t *irc, user_t *u, char *command, int flags );
+void root_command( irc_t *irc, char *command[] );
 void bitlbee_shutdown( gpointer data );
 double gettime( void );
 G_MODULE_EXPORT void http_encode( char *s );