daemon: move vfork/fork handling directly in lldpd.c

This is not needed elsewhere. This way, we ensure redefinition of
vfork() to fork() through a define is working as expected, even when
some system headers may try to rename vfork too.

Fix #264

diff --git a/src/daemon/lldpd.c b/src/daemon/lldpd.c
index b726882eb7cc33767bef176ed2d35a22f25ee3c4..3affe2811f79f2d82320f8511a167b0ee711bc48 100644 (file)
--- a/src/daemon/lldpd.c
+++ b/src/daemon/lldpd.c
@@ -40,6 +40,13 @@
 #include <pwd.h>
 #include <grp.h>
 
+#if HAVE_VFORK_H
+# include <vfork.h>
+#endif
+#if HAVE_WORKING_FORK
+# define vfork fork
+#endif
+
 static void             usage(void);
 
 static struct protocol protos[] =

diff --git a/src/daemon/lldpd.h b/src/daemon/lldpd.h
index 55fcfa3835736a54010290a07626c6281169f6eb..97306a2d47733e241d6ab512e0427b27df473f92 100644 (file)
--- a/src/daemon/lldpd.h
+++ b/src/daemon/lldpd.h
@@ -37,13 +37,6 @@
 #include <netinet/in.h>
 #include <sys/un.h>
 
-#if HAVE_VFORK_H
-# include <vfork.h>
-#endif
-#if HAVE_WORKING_FORK
-# define vfork fork
-#endif
-
 #include "lldp-tlv.h"
 #if defined (ENABLE_CDP) || defined (ENABLE_FDP)
 #  include "protocols/cdp.h"