Changeset: 19197c05de6e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=19197c05de6e Modified Files: tools/merovingian/daemon/controlrunner.c tools/merovingian/daemon/discoveryrunner.h tools/merovingian/daemon/forkmserver.c tools/merovingian/daemon/handlers.c tools/merovingian/daemon/merovingian.c tools/merovingian/daemon/multiplex-funnel.c tools/merovingian/daemon/multiplex-funnel.h tools/merovingian/daemon/proxy.c Branch: Jun2016 Log Message:
No need to include pthread.h multiple times. diffs (89 lines): diff --git a/tools/merovingian/daemon/controlrunner.c b/tools/merovingian/daemon/controlrunner.c --- a/tools/merovingian/daemon/controlrunner.c +++ b/tools/merovingian/daemon/controlrunner.c @@ -21,7 +21,6 @@ #include <signal.h> #include <errno.h> -#include <pthread.h> #include <msabaoth.h> #include <mcrypt.h> diff --git a/tools/merovingian/daemon/discoveryrunner.h b/tools/merovingian/daemon/discoveryrunner.h --- a/tools/merovingian/daemon/discoveryrunner.h +++ b/tools/merovingian/daemon/discoveryrunner.h @@ -9,8 +9,6 @@ #ifndef _DISCOVERYRUNNER_H #define _DISCOVERYRUNNER_H 1 -#include <pthread.h> - #include <msabaoth.h> void broadcast(char *msg); diff --git a/tools/merovingian/daemon/forkmserver.c b/tools/merovingian/daemon/forkmserver.c --- a/tools/merovingian/daemon/forkmserver.c +++ b/tools/merovingian/daemon/forkmserver.c @@ -16,7 +16,6 @@ #include <string.h> /* char ** */ #include <time.h> /* localtime */ #include <errno.h> -#include <pthread.h> #include <msabaoth.h> #include <utils/utils.h> diff --git a/tools/merovingian/daemon/handlers.c b/tools/merovingian/daemon/handlers.c --- a/tools/merovingian/daemon/handlers.c +++ b/tools/merovingian/daemon/handlers.c @@ -17,7 +17,6 @@ #include <sys/stat.h> /* open */ #include <fcntl.h> /* open */ #include <errno.h> -#include <pthread.h> #include <utils/properties.h> diff --git a/tools/merovingian/daemon/merovingian.c b/tools/merovingian/daemon/merovingian.c --- a/tools/merovingian/daemon/merovingian.c +++ b/tools/merovingian/daemon/merovingian.c @@ -69,7 +69,6 @@ #include <string.h> /* strerror */ #include <errno.h> #include <signal.h> /* handle Ctrl-C, etc. */ -#include <pthread.h> #include <time.h> #include "merovingian.h" diff --git a/tools/merovingian/daemon/multiplex-funnel.c b/tools/merovingian/daemon/multiplex-funnel.c --- a/tools/merovingian/daemon/multiplex-funnel.c +++ b/tools/merovingian/daemon/multiplex-funnel.c @@ -11,7 +11,6 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> -#include <pthread.h> #include <sys/types.h> #include <mapi.h> diff --git a/tools/merovingian/daemon/multiplex-funnel.h b/tools/merovingian/daemon/multiplex-funnel.h --- a/tools/merovingian/daemon/multiplex-funnel.h +++ b/tools/merovingian/daemon/multiplex-funnel.h @@ -9,7 +9,6 @@ #ifndef _MULTIPLEX_H #define _MULTIPLEX_H 1 -#include <pthread.h> #include <stdio.h> /* FILE */ #include <mapi.h> diff --git a/tools/merovingian/daemon/proxy.c b/tools/merovingian/daemon/proxy.c --- a/tools/merovingian/daemon/proxy.c +++ b/tools/merovingian/daemon/proxy.c @@ -17,7 +17,6 @@ #include <netinet/in.h> #include <fcntl.h> #include <string.h> /* strerror */ -#include <pthread.h> #ifdef HAVE_SYS_UIO_H # include <sys/uio.h> #endif _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
