X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fdropin.h;h=06db98b05eee6535204b3596534c992aae7641a1;hb=5dec7459d9920c930bdfb3ac0f2a3740a6247ec0;hp=dead180cd0b221c6103ccbd7db0cdeee710a79af;hpb=a86faaf34711d6b0f278b670d70a229a3cf0d479;p=meshlink

diff --git a/src/dropin.h b/src/dropin.h
index dead180c..06db98b0 100644
--- a/src/dropin.h
+++ b/src/dropin.h
@@ -1,7 +1,9 @@
+#ifndef MESHLINK_DROPIN_H
+#define MESHLINK_DROPIN_H
+
 /*
     dropin.h -- header file for dropin.c
-    Copyright (C) 2000-2005 Ivo Timmermans,
-                  2000-2013 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,16 +20,9 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __DROPIN_H__
-#define __DROPIN_H__
-
 #include "fake-getaddrinfo.h"
 #include "fake-getnameinfo.h"
 
-#ifndef HAVE_DAEMON
-extern int daemon(int, int);
-#endif
-
 #ifndef HAVE_GET_CURRENT_DIR_NAME
 extern char *get_current_dir_name(void);
 #endif
@@ -47,19 +42,19 @@ extern int usleep(long long usec);
 
 #ifndef timeradd
 #define timeradd(a, b, r) do {\
-	(r)->tv_sec = (a)->tv_sec + (b)->tv_sec;\
-	(r)->tv_usec = (a)->tv_usec + (b)->tv_usec;\
-	if((r)->tv_usec >= 1000000)\
-		(r)->tv_sec++, (r)->tv_usec -= 1000000;\
+        (r)->tv_sec = (a)->tv_sec + (b)->tv_sec;\
+        (r)->tv_usec = (a)->tv_usec + (b)->tv_usec;\
+        if((r)->tv_usec >= 1000000)\
+                (r)->tv_sec++, (r)->tv_usec -= 1000000;\
 } while (0)
 #endif
 
 #ifndef timersub
 #define timersub(a, b, r) do {\
-	(r)->tv_sec = (a)->tv_sec - (b)->tv_sec;\
-	(r)->tv_usec = (a)->tv_usec - (b)->tv_usec;\
-	if((r)->tv_usec < 0)\
-		(r)->tv_sec--, (r)->tv_usec += 1000000;\
+        (r)->tv_sec = (a)->tv_sec - (b)->tv_sec;\
+        (r)->tv_usec = (a)->tv_usec - (b)->tv_usec;\
+        if((r)->tv_usec < 0)\
+                (r)->tv_sec--, (r)->tv_usec += 1000000;\
 } while (0)
 #endif
 
@@ -70,4 +65,4 @@ extern int usleep(long long usec);
 #endif
 #endif
 
-#endif /* __DROPIN_H__ */
+#endif