build fixes from nick mathewson

svn:r139

3 files changed, 14 insertions, 7 deletions

diff --git a/buffer.c b/buffer.c
index e30c46f3..f334f219 100644
--- a/buffer.c
+++ b/buffer.c
@@ -25,12 +25,17 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/types.h>
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#ifdef HAVE_VASPRINTF
+/* If we have vasprintf, we need to define this before we include stdio.h. */
+#define _GNU_SOURCE
+#endif
+
+#include <sys/types.h>
+
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
diff --git a/log.c b/log.c
index 7aac5ef3..6b5755f8 100644
--- a/log.c
+++ b/log.c
@@ -37,6 +37,10 @@
  * SUCH DAMAGE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifdef WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -47,7 +51,7 @@
 #include <sys/tree.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else 
+#else
 #include <sys/_time.h>
 #endif
 #include <stdio.h>
@@ -57,6 +61,8 @@
 #include <errno.h>
 #include "event.h"
 
+#include "log.h"
+
 static void _warn_helper(int severity, int log_errno, const char *fmt,
                          va_list ap);
 static void event_log(int severity, const char *msg);
diff --git a/signal.c b/signal.c
index cc557388..19a85f14 100644
--- a/signal.c
+++ b/signal.c
@@ -56,10 +56,6 @@ static short evsigcaught[NSIG];
 static int needrecalc;
 volatile sig_atomic_t evsignal_caught = 0;
 
-void evsignal_process(void);
-int evsignal_recalc(sigset_t *);
-int evsignal_deliver(sigset_t *);
-
 static struct event ev_signal;
 static int ev_signal_pair[2];
 static int ev_signal_added;