Merge pull request #124 from tokkee/bj/build

Fix some build issues on AIX using automake <= 1.9 and gcc 4.7.1.

diff --git a/src/Makefile.am b/src/Makefile.am
index ba59bf5..782fad9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1335,7 +1335,7 @@ EXTRA_DIST +=   collectd.conf.pod \
        fi
 
 pinba.pb-c.c pinba.pb-c.h: pinba.proto
-       protoc-c --c_out $(builddir) pinba.proto
+       protoc-c --c_out . pinba.proto
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(sysconfdir)

diff --git a/src/amqp.c b/src/amqp.c
index 55d2a2c..89284c8 100644 (file)
--- a/src/amqp.c
+++ b/src/amqp.c
@@ -641,6 +641,7 @@ static void *camqp_subscribe_thread (void *user_data) /* {{{ */
 
     camqp_config_free (conf);
     pthread_exit (NULL);
+    return (NULL);
 } /* }}} void *camqp_subscribe_thread */
 
 static int camqp_subscribe_init (camqp_config_t *conf) /* {{{ */

diff --git a/src/email.c b/src/email.c
index 8fc5509..5870ab1 100644 (file)
--- a/src/email.c
+++ b/src/email.c
@@ -376,6 +376,7 @@ static void *collect (void *arg)
        } /* while (1) */
 
        pthread_exit ((void *)0);
+       return ((void *) 0);
 } /* static void *collect (void *) */
 
 static void *open_connection (void __attribute__((unused)) *arg)
@@ -548,7 +549,9 @@ static void *open_connection (void __attribute__((unused)) *arg)
 
                pthread_cond_signal (&conn_available);
        }
-       pthread_exit ((void *)0);
+
+       pthread_exit ((void *) 0);
+       return ((void *) 0);
 } /* static void *open_connection (void *) */
 
 static int email_init (void)