r1877: since make proto catches all functions

the inlcude has to move to includes.h

metze
(This used to be commit 97fe38183b6a03c01f6ac2d28a958d632eb4ff8a)

diff --git a/source4/include/includes.h b/source4/include/includes.h
index 53a5a969e516017cce099833905a9867ca514182..c4b8f24397e287a6d41b69875277f33cfa9310bc 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -673,6 +673,7 @@ extern int errno;
 #include "gtk/common/select.h"
 
 #include "libnet/libnet.h"
+#include "utils/net/net.h"
 
 #define malloc_p(type) (type *)malloc(sizeof(type))
 #define malloc_array_p(type, count) (type *)realloc_array(NULL, sizeof(type), count)

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index ddca5662a252a506f0eb9495a3922d2dd5199f85..a636e4cdaa56731e196a4772306858443b25a5a6 100644 (file)
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -42,7 +42,6 @@
 /*****************************************************/
 
 #include "includes.h"
-#include "utils/net/net.h"
 
 /*
   run a function from a function table. If not found then