Changeset: e16ff2ece465 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e16ff2ece465 Modified Files: sql/src/backends/monet5/merovingian/daemon/merovingian.c sql/src/backends/monet5/merovingian/daemon/peering.c Branch: default Log Message:
match actual declaration and extern of _mero_keep_listening, include function definitions instead of declaring them extern diffs (27 lines): diff -r 5d90e7430f2b -r e16ff2ece465 sql/src/backends/monet5/merovingian/daemon/merovingian.c --- a/sql/src/backends/monet5/merovingian/daemon/merovingian.c Mon Sep 20 15:16:41 2010 +0200 +++ b/sql/src/backends/monet5/merovingian/daemon/merovingian.c Mon Sep 20 15:23:01 2010 +0200 @@ -108,7 +108,7 @@ /* for the logger, when set to 0, the logger terminates */ int _mero_keep_logging = 1; /* for accepting connections, when set to 0, listening socket terminates */ -int _mero_keep_listening = 1; +char _mero_keep_listening = 1; /* stream to the stdout output device (tty or file) */ FILE *_mero_streamout = NULL; /* stream to the stderr output device (tty or file) */ diff -r 5d90e7430f2b -r e16ff2ece465 sql/src/backends/monet5/merovingian/daemon/peering.c --- a/sql/src/backends/monet5/merovingian/daemon/peering.c Mon Sep 20 15:16:41 2010 +0200 +++ b/sql/src/backends/monet5/merovingian/daemon/peering.c Mon Sep 20 15:23:01 2010 +0200 @@ -24,9 +24,8 @@ #include <string.h> #include <gdk.h> -extern void broadcast(char *); -extern void registerMessageTap(int); -extern void unregisterMessageTap(int); +#include "discoveryrunner.h" + extern char *_mero_hostname; extern unsigned short _mero_port; extern char _mero_keep_listening; _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
