commit d3921466b543e4798cc1e8bbf94e05bd5035b385 Author: Robert Hogan robert@roberthogan.net Date: Sun Oct 23 18:14:49 2011 +0100
Issue 26: common.h is a local header and should be included using #include "common.h"
Patch by: Anthony G Basile (blueness@gentoo.org) --- src/common.c | 3 ++- src/socks.c | 4 ++-- src/torsocks.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/common.c b/src/common.c index d48e853..8fe3303 100644 --- a/src/common.c +++ b/src/common.c @@ -33,7 +33,6 @@ #include <config.h> #include <stdio.h> #include <netdb.h> -#include <common.h> #include <stdarg.h> #include <errno.h> #include <stdlib.h> @@ -44,6 +43,8 @@ #include <sys/types.h> #include <netinet/in.h>
+#include "common.h" + /* Globals */ int loglevel = MSGERR; /* The default logging level is to only log error messages */ diff --git a/src/socks.c b/src/socks.c index 37b97f5..dd3a229 100644 --- a/src/socks.c +++ b/src/socks.c @@ -57,7 +57,6 @@ From 'man compat' in OSX: #include <pwd.h> #include <errno.h> #include <fcntl.h> -#include <common.h> #include <pthread.h> #include <stdarg.h> #if !defined(__APPLE__) && !defined(__darwin__) @@ -65,9 +64,10 @@ From 'man compat' in OSX: #endif #include <resolv.h>
+#include "common.h" +#include "dead_pool.h" #include "parser.h" #include "socks.h" -#include "dead_pool.h"
static int connect_server(struct connreq *conn); static int send_socks_request(struct connreq *conn); diff --git a/src/torsocks.c b/src/torsocks.c index a7af809..c4004d9 100644 --- a/src/torsocks.c +++ b/src/torsocks.c @@ -62,7 +62,6 @@ const char *torsocks_progname = "libtorsocks"; /* Name used in err msgs #include <pwd.h> #include <errno.h> #include <fcntl.h> -#include <common.h> #include <pthread.h> #include <stdarg.h> #if !defined(__APPLE__) && !defined(__darwin__) @@ -70,9 +69,10 @@ const char *torsocks_progname = "libtorsocks"; /* Name used in err msgs #endif #include <resolv.h>
+#include "common.h" +#include "dead_pool.h" #include "parser.h" #include "socks.h" -#include "dead_pool.h"
/* Some function names are macroized on Darwin. Allow those names to expand accordingly. */