generic build fixes

diff --git a/.gitignore b/.gitignore
index 3c1c4b2efd6a280ba0fc913fd85d6313dc3faae7..925d109c1b732d8c88cc93f0438871c4afbccce3 100644 (file)
--- 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 fa048b321fabcc1de4ed4e29721e28cc639f2195..599eb41a0e6bc521e5f818d333f7915f68ab2ed5 100644 (file)
--- 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 c74afc2fe6c604ed2f03b2d4ef4a22be40ec0b2b..2fa37e7ecbb48bf87c3853a66cad47b22e2874c4 100644 (file)
--- 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)