From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sat, 22 May 2010 18:36:07 +0000 (+0100)
Subject: generic build fixes
X-Git-Tag: userv/0.6.1~87
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv-utils.git;a=commitdiff_plain;h=33e8a62b26621ae0dc48ee96cfcefbf5e70af7cd;ds=sidebyside

generic build fixes
---

diff --git a/.gitignore b/.gitignore
index 3c1c4b2..925d109 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *~
+*.new
 
 dist_tmp
 userv-utils-*.tar.gz
diff --git a/ipif/forwarder.h b/ipif/forwarder.h
index fa048b3..599eb41 100644
--- a/ipif/forwarder.h
+++ b/ipif/forwarder.h
@@ -28,8 +28,6 @@
 #include <string.h>
 #include <sys/utsname.h>
 
-#include "automech.h"
-
 struct buffer {
   unsigned char *base;
   unsigned char *start;
@@ -52,6 +50,8 @@ struct mechanism {
   mdec_functype *decode;
 };
 
+#include "automech.h"
+
 extern const struct mechanism *const mechanismlists[];
 
 /* setup function may call getarg_xxx functions and then
diff --git a/settings.make b/settings.make
index c74afc2..2fa37e7 100644
--- a/settings.make
+++ b/settings.make
@@ -38,7 +38,7 @@ etcuserv=	$(etcdir)/userv
 services=	$(etcuserv)/services.d
 
 CFLAGS=	-Wall -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes \
-	-Wpointer-arith -D_GNU_SOURCE \
+	-Wpointer-arith -D_GNU_SOURCE -Wno-pointer-sign \
 	$(OPTIMISE) $(DEBUG) $(SUBDIR_CFLAGS)
 LDFLAGS= $(SUBDIR_LDFLAGS)